From ff56e98015b17c73a3f1aacf3deef5ec4ef4e21b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 19 Jul 2007 10:37:05 +0100 Subject: apt-pkg/deb/dpkgpm.{cc,h} - a bit cleanup - move the log date to the right place - write log to dir::log::name apt-pkg/init.cc: - init dir::log::name "/var/log/apt/term.log" debian/apt.dirs: - create /var/log/apt/ doc/examples/configure-index: - add new dir::log::name to the index --- debian/apt.dirs | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/apt.dirs b/debian/apt.dirs index 1543e8bb1..26bb0683c 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -7,4 +7,5 @@ etc/apt/sources.list.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/apt/periodic +var/log/apt usr/share/bug/apt -- cgit v1.2.3-70-g09d2 From b574dd1fac99ba71b1d0adf0aa164100fcf0cb91 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 19 Jul 2007 10:46:47 +0100 Subject: add logrotate support --- debian/apt.dirs | 1 + debian/apt.logrotate | 8 ++++++++ debian/rules | 1 + 3 files changed, 10 insertions(+) create mode 100644 debian/apt.logrotate (limited to 'debian') diff --git a/debian/apt.dirs b/debian/apt.dirs index 26bb0683c..8ce9b175a 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -4,6 +4,7 @@ usr/lib/dpkg/methods/apt etc/apt etc/apt/apt.conf.d etc/apt/sources.list.d +etc/logrotate.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/apt/periodic diff --git a/debian/apt.logrotate b/debian/apt.logrotate new file mode 100644 index 000000000..3e924d383 --- /dev/null +++ b/debian/apt.logrotate @@ -0,0 +1,8 @@ +/var/log/apt/term.log { + rotate 6 + monthly + compress + missingok + notifempty +} + diff --git a/debian/rules b/debian/rules index 3ebecfba4..dfee44fde 100755 --- a/debian/rules +++ b/debian/rules @@ -209,6 +209,7 @@ apt: build debian/shlibs.local cp -r $(BLD)/locale debian/$@/usr/share/ cp debian/bugscript debian/$@/usr/share/bug/apt/script + cp debian/apt.logrotate debian/$@/etc/logrorate.d/apt cp share/debian-archive.gpg debian/$@/usr/share/$@ cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove -- cgit v1.2.3-70-g09d2 From ac005224d02d7d993074697f11009ff40f57cb6b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 28 Jul 2007 12:25:01 -0300 Subject: * Applied patch from Guillem Jover to add support to add lzma support (closes: #408201) --- apt-inst/deb/debfile.cc | 10 ++++++++-- apt-pkg/deb/debsrcrecords.cc | 2 +- debian/changelog | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index 9d83120f8..cd7a88808 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -44,8 +44,10 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File) return; } - if (!CheckMember("data.tar.gz") && !CheckMember("data.tar.bz2")) { - _error->Error(_("This is not a valid DEB archive, it has no '%s' or '%s' member"), "data.tar.gz", "data.tar.bz2"); + if (!CheckMember("data.tar.gz") && + !CheckMember("data.tar.bz2") && + !CheckMember("data.tar.lzma")) { + _error->Error(_("This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"), "data.tar.gz", "data.tar.bz2", "data.tar.lzma"); return; } } @@ -130,6 +132,10 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream) Member = AR.FindMember("data.tar.bz2"); Compressor = "bzip2"; } + if (Member == 0) { + Member = AR.FindMember("data.tar.lzma"); + Compressor = "lzma"; + } if (Member == 0) return _error->Error(_("Internal error, could not locate member")); if (File.Seek(Member->Start) == false) diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index fcd9bb901..ace4e00b5 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -137,7 +137,7 @@ bool debSrcRecordParser::Files(vector &List) break; F.Type = string(F.Path,Tmp+1,Pos-Tmp); - if (F.Type == "gz" || F.Type == "bz2") + if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma") { Pos = Tmp-1; continue; diff --git a/debian/changelog b/debian/changelog index 8961a0257..7f8d8f0dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.5) UNRELEASED; urgency=low [ Otavio Salvador ] * Applied patch from Guillem Jover to use dpkg-architecture to get the host architecture (closes: #407187) + * Applied patch from Guillem Jover to add + support to add lzma support (closes: #408201) [ Michael Vogt ] * apt-pkg/depcache.cc: -- cgit v1.2.3-70-g09d2 From 96c1153afd783c40af8bce9add60fb0b6f18080d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Jul 2007 21:48:03 +0200 Subject: * methods/makefile: - install lzma symlink method (for full lzma support) * debian/control: - suggest "lzma" --- configure.in | 2 +- debian/changelog | 4 ++++ debian/control | 2 +- methods/makefile | 11 ++++++++--- 4 files changed, 14 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/configure.in b/configure.in index ad913f53e..c33451390 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.4") +AC_DEFINE_UNQUOTED(VERSION,"0.7.5") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 7f8d8f0dd..3cac980a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ apt (0.7.5) UNRELEASED; urgency=low - support a list of sections for: APT::Install-Recommends-Sections APT::Never-MarkAuto-Sections + * methods/makefile: + - install lzma symlink method (for full lzma support) + * debian/control: + - suggest "lzma" -- Otavio Salvador Wed, 25 Jul 2007 20:16:46 -0300 diff --git a/debian/control b/debian/control index 76e5b1a19..742e8ca5c 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Depends: ${shlibs:Depends}, debian-archive-keyring Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2 +Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. diff --git a/methods/makefile b/methods/makefile index f178cbbea..f0fd4e414 100644 --- a/methods/makefile +++ b/methods/makefile @@ -80,9 +80,9 @@ LIB_MAKES = apt-pkg/makefile SOURCE = rsh.cc include $(PROGRAM_H) -# SSH and vzip2 method symlink -binary: $(BIN)/ssh $(BIN)/bzip2 -veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 +# SSH and bzip2 method symlink +binary: $(BIN)/ssh $(BIN)/bzip2 $(BIN)/lzma +veryclean: clean-$(BIN)/ssh clean-$(BIN)/bzip2 clean-$(BIN)/lzma $(BIN)/ssh: echo "Installing ssh method link" ln -fs rsh $(BIN)/ssh @@ -92,5 +92,10 @@ clean-$(BIN)/ssh: $(BIN)/bzip2: echo "Installing bzip2 method link" ln -fs gzip $(BIN)/bzip2 +$(BIN)/lzma: + echo "Installing lzma method link" + ln -fs gzip $(BIN)/lzma clean-$(BIN)/bzip2: -rm $(BIN)/bzip2 +clean-$(BIN)/lzma: + -rm $(BIN)/lzma -- cgit v1.2.3-70-g09d2 From da3f032553cbd548c2c810210d4ce4499d3767b6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 30 Jul 2007 20:26:53 -0300 Subject: Changed Guillem's mail address as per his request --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3cac980a9..31611e9ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ apt (0.7.5) UNRELEASED; urgency=low [ Otavio Salvador ] - * Applied patch from Guillem Jover to use + * Applied patch from Guillem Jover to use dpkg-architecture to get the host architecture (closes: #407187) - * Applied patch from Guillem Jover to add + * Applied patch from Guillem Jover to add support to add lzma support (closes: #408201) [ Michael Vogt ] -- cgit v1.2.3-70-g09d2 From 64a3bcac6e4ea6c166f254a1c0f15b23b5dd92dc Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 31 Jul 2007 15:23:12 -0300 Subject: Release 0.7.5 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 31611e9ab..7add92738 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.5) UNRELEASED; urgency=low +apt (0.7.5) unstable; urgency=low [ Otavio Salvador ] * Applied patch from Guillem Jover to use -- cgit v1.2.3-70-g09d2 From 5b28c8040795b53a4df54f33e57976720558ed32 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 1 Aug 2007 19:51:20 -0300 Subject: * Applied patch from Aurelien Jarno to fix wrong directory downloading on non-linux architectures (closes: #435597) --- apt-pkg/init.cc | 8 +------- apt-pkg/init.h | 2 -- buildlib/config.h.in | 7 ++----- cmdline/apt-cache.cc | 4 ++-- cmdline/apt-cdrom.cc | 4 ++-- cmdline/apt-config.cc | 4 ++-- cmdline/apt-extracttemplates.cc | 4 ++-- cmdline/apt-get.cc | 4 ++-- cmdline/apt-sortpkgs.cc | 4 ++-- configure.in | 11 ++--------- debian/changelog | 7 +++++++ ftparchive/apt-ftparchive.cc | 4 ++-- 12 files changed, 26 insertions(+), 37 deletions(-) (limited to 'debian') diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 2f15486d9..3ebd592c9 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -24,8 +24,6 @@ const char *pkgVersion = VERSION; const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "." Stringfy(APT_PKG_MINOR) "." Stringfy(APT_PKG_RELEASE); -const char *pkgCPU = COMMON_CPU; -const char *pkgOS = COMMON_OS; // pkgInitConfig - Initialize the configuration class /*{{{*/ // --------------------------------------------------------------------- @@ -35,11 +33,7 @@ const char *pkgOS = COMMON_OS; bool pkgInitConfig(Configuration &Cnf) { // General APT things - if (strcmp(COMMON_OS,"linux") == 0 || - strcmp(COMMON_OS,"unknown") == 0) - Cnf.Set("APT::Architecture",COMMON_CPU); - else - Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU); + Cnf.Set("APT::Architecture", COMMON_ARCH); Cnf.Set("APT::Build-Essential::", "build-essential"); Cnf.Set("APT::Install-Recommends", false); Cnf.Set("APT::Install-Suggests", false); diff --git a/apt-pkg/init.h b/apt-pkg/init.h index bc0e55036..b33d2db81 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -23,8 +23,6 @@ extern const char *pkgVersion; extern const char *pkgLibVersion; -extern const char *pkgOS; -extern const char *pkgCPU; bool pkgInitConfig(Configuration &Cnf); bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys); diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 8a65a229a..eddb16246 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -32,11 +32,8 @@ /* If there is no socklen_t, define this for the netdb shim */ #undef NEED_SOCKLEN_T_DEFINE -/* Define the cpu name string */ -#undef COMMON_CPU - -/* Define the on name string */ -#undef COMMON_OS +/* Define the arch name string */ +#undef COMMON_ARCH /* The version number string */ #undef VERSION diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index cc4c1559e..c0655da40 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1711,8 +1711,8 @@ bool GenCaches(CommandLine &Cmd) /* */ bool ShowHelp(CommandLine &Cmd) { - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return true; diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 7434a7225..379a433ea 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -135,8 +135,8 @@ bool DoIdent(CommandLine &) /* */ int ShowHelp() { - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return 0; diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 34365dc2e..63fa0867c 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -67,8 +67,8 @@ bool DoDump(CommandLine &CmdL) /* */ int ShowHelp() { - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return 0; diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index c87b436ba..6d580cc28 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -222,8 +222,8 @@ bool DebFile::ParseInfo() /* */ int ShowHelp(void) { - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return 0; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index df0414076..b216204d2 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2582,8 +2582,8 @@ bool DoMoo(CommandLine &CmdL) /* */ bool ShowHelp(CommandLine &CmdL) { - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) { diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc index 8909c3826..7b2a74aed 100644 --- a/cmdline/apt-sortpkgs.cc +++ b/cmdline/apt-sortpkgs.cc @@ -141,8 +141,8 @@ bool DoIt(string InFile) /* */ int ShowHelp() { - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return 0; diff --git a/configure.in b/configure.in index c33451390..0294b9ae7 100644 --- a/configure.in +++ b/configure.in @@ -80,20 +80,13 @@ dnl Converts the ARCH to be something singular for this general CPU family dnl This is often the dpkg architecture string. dnl First check against the full canonical canoncial-system-type in $target dnl and if that fails, just look for the cpu -AC_MSG_CHECKING(system architecture) +AC_MSG_CHECKING(debian architecture) archset="`dpkg-architecture -qDEB_HOST_ARCH`" if test "x$archset" = "x"; then AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) fi AC_MSG_RESULT($archset) -AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset") - -dnl Get a common name for the host OS - this is primarily only for HURD and is -dnl non fatal if it fails -AC_MSG_CHECKING(system OS) -osset="`dpkg-architecture -qDEB_HOST_ARCH_OS`" -AC_MSG_RESULT($osset) -AC_DEFINE_UNQUOTED(COMMON_OS,"$osset") +AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") dnl We use C99 types if at all possible AC_CACHE_CHECK([for C99 integer types],c9x_ints,[ diff --git a/debian/changelog b/debian/changelog index 7add92738..873df1693 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.6) unstable; urgency=low + + * Applied patch from Aurelien Jarno to fix wrong + directory downloading on non-linux architectures (closes: #435597) + + -- Otavio Salvador Wed, 01 Aug 2007 19:49:51 -0300 + apt (0.7.5) unstable; urgency=low [ Otavio Salvador ] diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 290326ec3..3b1e80631 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -544,8 +544,8 @@ void LoadBinDir(vector &PkgList,Configuration &Setup) /* */ bool ShowHelp(CommandLine &CmdL) { - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return true; -- cgit v1.2.3-70-g09d2 From 57539d9e0512081f18267d125d9d1257b238e7c9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 2 Aug 2007 11:56:54 +0200 Subject: * apt-inst/contrib/extracttar.cc: - fix fd leak for zero size files --- apt-inst/contrib/extracttar.cc | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc index 8a535967f..68c871a5d 100644 --- a/apt-inst/contrib/extracttar.cc +++ b/apt-inst/contrib/extracttar.cc @@ -332,7 +332,7 @@ bool ExtractTar::Go(pkgDirStream &Stream) } // And finish up - if (Itm.Size != 0 && BadRecord == false) + if (Itm.Size >= 0 && BadRecord == false) if (Stream.FinishedFile(Itm,Fd) == false) return false; diff --git a/debian/changelog b/debian/changelog index 873df1693..d7f844f5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.7) UNRELEASED; urgency=low + + * apt-inst/contrib/extracttar.cc: + - fix fd leak for zero size files + + -- Michael Vogt Thu, 02 Aug 2007 11:55:54 +0200 + apt (0.7.6) unstable; urgency=low * Applied patch from Aurelien Jarno to fix wrong -- cgit v1.2.3-70-g09d2 From a1e9299a9485a219f3a1e3736b1cec21aa24577f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Aug 2007 00:56:57 +0200 Subject: debian/changelog: updated credits --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d7f844f5c..75db9cc72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ apt (0.7.7) UNRELEASED; urgency=low * apt-inst/contrib/extracttar.cc: - - fix fd leak for zero size files + - fix fd leak for zero size files (thanks to Bill Broadley for + reporting this bug) -- Michael Vogt Thu, 02 Aug 2007 11:55:54 +0200 -- cgit v1.2.3-70-g09d2