From 21fd1746e37e695f569121c0b6489770ec6a8b0e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 10 Jul 2007 15:06:12 -0300 Subject: * Fix compilation warnings: - apt-pkg/contrib/configuration.cc: wrong argument type; - apt-pkg/deb/dpkgpm.cc: wrong signess; - apt-pkg-acquire-item.cc: wrong signess and orderned initializers; - methods/https.cc: - type conversion; - unused variable; - changed SetupProxy() method to void; --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index cb86ce580..a97018ac8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,14 @@ apt (0.7.4) UNRELEASED; urgency=low * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) + * Fix compilation warnings: + - apt-pkg/contrib/configuration.cc: wrong argument type; + - apt-pkg/deb/dpkgpm.cc: wrong signess; + - apt-pkg-acquire-item.cc: wrong signess and orderned initializers; + - methods/https.cc: + - type conversion; + - unused variable; + - changed SetupProxy() method to void; -- Otavio Salvador Mon, 02 Jul 2007 13:27:54 -0300 -- cgit v1.2.3-70-g09d2 From f03dd1e032139356f1e5b7f19fb76482ae05e311 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 12 Jul 2007 16:49:43 +0100 Subject: - fix in the task-install code regexp (thanks to Adam Conrad and Colin Watson) --- cmdline/apt-get.cc | 5 +++-- configure.in | 2 +- debian/changelog | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debian/changelog') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ed4d5ce5f..95600ff6d 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1519,8 +1519,9 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, // build regexp for the task char S[300]; - snprintf(S, sizeof(S), "^Task:.*[^a-z]%s([^a-z]|\n|$)", taskname); - regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); + snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", taskname); + if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) + return _error->Error("Failed to compile task regexp"); bool found = false; bool res = true; diff --git a/configure.in b/configure.in index 4daa0ab78..9bb1a8baf 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.2-0.1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.4") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 2703b98cf..d18c19d0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ apt (0.7.4) UNRELEASED; urgency=low [Michael Vogt] * cmdline/apt-get.cc: - - fix in the task-install code + - fix in the task-install code regexp (thanks to Adam Conrad and + Colin Watson) [Otavio Salvador] * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) * Fix compilation warnings: -- cgit v1.2.3-70-g09d2