Merge branch 'debian/experimental' of https://github.com/DonKult/apt into debian...

diff --git a/.travis.yml b/.travis.yml
index b449aeba59d2e25fb88bb1affa0a29b00573b8f3..a20018a7975d63bac5d83b49109fa7f56f22cbd3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 language: cpp
 before_install:
+ - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
  - sudo apt-get update -q
+install:
  - sudo ./prepare-release travis-ci
-script: make && make test && test/integration/run-tests
+ - export CC=gcc-5
+ - export CXX=g++-5
+script: make -j1 && make test && test/integration/run-tests

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 2c84020fe03696e9d8b02669f3075c92df1a0fb3..e9ef4e9acbb94ba8024ab16c08a9db570a486100 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -538,7 +538,7 @@ bool pkgAcquire::Worker::MediaChange(string Message)
       ostringstream msg,status;
       ioprintf(msg,_("Please insert the disc labeled: "
                     "'%s' "
-                    "in the drive '%s' and press enter."),
+                    "in the drive '%s' and press [Enter]."),
               Media.c_str(),Drive.c_str());
       status << "media-change: "  // message
             << Media  << ":"     // media

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index c578cc338387983e549b99f013206090a4b637fa..644e4d8e4312617ae187fd1aff00910b9055b3ad 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1545,9 +1545,6 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
               _exit(100);
         }
 
-        /* No Job Control Stop Env is a magic dpkg var that prevents it
-           from using sigstop */
-        putenv((char *)"DPKG_NO_TSTP=yes");
         execvp(Args[0], (char**) &Args[0]);
         cerr << "Could not exec dpkg!" << endl;
         _exit(100);

diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index f6c3d1204ac8feab6441b0634ab0e7bbdbc084ff..62b2c13d0b55628df13be66db665ad72a46f9739 100644 (file)
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -296,7 +296,7 @@ bool AcqTextStatus::MediaChange(std::string Media, std::string Drive)
    clearLastLine();
    ioprintf(out,_("Media change: please insert the disc labeled\n"
                   " '%s'\n"
-                  "in the drive '%s' and press enter\n"),
+                  "in the drive '%s' and press [Enter]\n"),
            Media.c_str(),Drive.c_str());
 
    char C = 0;

diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak
index deb3da377882a8ff835ff6ba1faa73c4f31dd8bc..1b1855be3537e8adda147d2e5c5f344708492828 100644 (file)
--- a/buildlib/libversion.mak
+++ b/buildlib/libversion.mak
@@ -4,11 +4,11 @@
 # with each non-ABI break to the lib, please increase RELEASE.
 # The versionnumber is extracted from apt-pkg/macros.h - see also there.
 LIBAPTPKG_MAJOR=$(shell awk -v ORS='.' '/^\#define APT_PKG_M/ {print $$3}' $(BASE)/apt-pkg/contrib/macros.h | sed 's/\.$$//')
-LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/contrib/macros.h | cut -d ' ' -f 3)
+LIBAPTPKG_RELEASE=$(shell grep '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/contrib/macros.h | cut -d ' ' -f 3)
 
 # Version number of libapt-inst
 # Please increase MAJOR with each ABI break,
 # with each non-ABI break to the lib, please increase MINOR.
 # The versionnumber is extracted from apt-inst/makefile - see also there.
-LIBAPTINST_MAJOR=$(shell egrep '^MAJOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)
-LIBAPTINST_MINOR=$(shell egrep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)
+LIBAPTINST_MAJOR=$(shell grep '^MAJOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)
+LIBAPTINST_MINOR=$(shell grep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index c0541d196a17c867403c7c24513094595eaa7073..dcc7847467b12c9be1d2ebfbf76df4e232c735a2 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -89,7 +89,7 @@ void pkgCdromTextStatus::Update(string text, int /*current*/)
 
 bool pkgCdromTextStatus::ChangeCdrom()
 {
-   Prompt(_("Please insert a Disc in the drive and press enter"));
+   Prompt(_("Please insert a Disc in the drive and press [Enter]"));
    return true;
 }
 

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 61d6aa6f0faa67d3639ec7956e745ac00be5923f..765dd4ae4164ea9eadbd932344645ff6d07ddfaf 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -68,6 +68,19 @@
 #      1:  progress report       (actually any string)
 #      2:  + command outputs     (remove -qq, remove 2>/dev/null, add -d)
 #      3:  + trace on            
+#
+#  APT::Periodic::RandomSleep "1800";
+#  - The apt cron job will delay its execution by a random
+#    time span between zero and 'APT::Periodic::RandomSleep'
+#    seconds.
+#    This is done because otherwise everyone would access the
+#    mirror servers at the same time and put them collectively
+#    under very high strain.
+#    You can set this to '0' if you are using a local mirror and
+#    do not care about the load spikes.
+#    Note that sleeping in the apt job will be delaying the
+#    execution of all subsequent cron.daily jobs.
+#
 
 check_stamp()
 {

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 103d0622c0a569f92567412e25a712219c78298b..d5e18575797575f6637e611d9f2e5831060ee50e 100644 (file)
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -690,7 +690,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 
    <para>
      The configuration item <literal>RootDir</literal> has a special
-     meaning.  If set, all paths in <literal>Dir::</literal> will be
+     meaning.  If set, all paths will be
      relative to <literal>RootDir</literal>, <emphasis>even paths that
      are specified absolutely</emphasis>.  So, for instance, if
      <literal>RootDir</literal> is set to
@@ -699,6 +699,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      <filename>/var/lib/dpkg/status</filename>, then the status file
      will be looked up in
      <filename>/tmp/staging/var/lib/dpkg/status</filename>.
+     If you want to prefix only relative paths, set <literal>Dir</literal> instead.
    </para>
 
    <para>
@@ -774,10 +775,34 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      install to the commands, one per line on the requested file descriptor, defaulting
      to standard input.</para>
 
-     <para>Version 2 of this protocol dumps more information, including the
-     protocol version, the APT configuration space and the packages, files
-     and versions being changed. Version 3 adds the architecture and <literal>MultiArch</literal>
-     flag to each version being dumped.</para>
+     <para>Version 2 of this protocol sends more information through the requested
+     file descriptor: a line with the text <literal>VERSION 2</literal>,
+     the APT configuration space, and a list of package actions with filename
+     and version information.</para>
+
+     <para>Each configuration directive line has the form
+     <literal>key=value</literal>.  Special characters (equal signs, newlines,
+     nonprintable characters, quotation marks, and percent signs in
+     <literal>key</literal> and newlines, nonprintable characters, and percent
+     signs in <literal>value</literal>) are %-encoded. Lists are represented
+     by multiple <literal>key::=value</literal> lines with the same key. The
+     configuration section ends with a blank line.</para>
+
+     <para>Package action lines consist of five fields in Version 2: old version, direction
+     of version change (&lt; for upgrades, &gt; for downgrades, = for no
+     change), new version, action. The version fields are "-" for no version
+     at all (for example when installing a package for the first time; no
+     version is treated as earlier than any real version, so that is an
+     upgrade, indicated as <literal>- &lt; 1.23.4</literal>). The action field
+     is "**CONFIGURE**" if the package is being configured, "**REMOVE**" if it
+     is being removed, or the filename of a .deb file if it is being
+     unpacked.</para>
+
+     <para>In Version 3 after each version field follows the architecture
+     of this version, which is "-" if there is no version, and a field showing
+     the MultiArch type "same", foreign", "allowed" or "none". Note that "none"
+     is an incorrect typename which is just kept to remain compatible, it
+     should be read as "no" and users are encouraged to support both.</para>
 
      <para>The version of the protocol to be used for the command
      <literal><replaceable>cmd</replaceable></literal> can be chosen by setting

diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 81e0bd22079dfc51598a83108597e250977aec67..28b795d430abadfa0bf8d4490d32610afce5236c 100644 (file)
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -267,7 +267,7 @@ expression surrounded by slashes).
 
 <programlisting>
 Package: gnome* /kde/
-Pin: release n=experimental
+Pin: release a=experimental
 Pin-Priority: 500
 </programlisting>
 

diff --git a/doc/dpkg-tech.dbk b/doc/dpkg-tech.dbk
index 2584cf640bce1c57739811e28a74ec813544ec2d..f95716cf4e5b4d30c126ce9545146251f068b153 100644 (file)
--- a/doc/dpkg-tech.dbk
+++ b/doc/dpkg-tech.dbk
@@ -404,15 +404,7 @@ As yet unwritten. You can refer to the other manuals for now. See
 <itemizedlist>
 <listitem>
 <para>
-DPKG_NO_TSTP - if set to a non-null value, this variable causes dpkg to run a
-child shell process instead of sending itself a SIGTSTP, when the user selects
-to background the dpkg process when it asks about conffiles.
-</para>
-</listitem>
-<listitem>
-<para>
-SHELL - used to determine which shell to run in the case when DPKG_NO_TSTP
-is set.
+SHELL - used to determine which shell to run.
 </para>
 </listitem>
 <listitem>

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 509b5da344a88e82a0394edd1272dd3c762fa49a..35db9571d2109dbaef8f19f4cb0b0ab97a9303e9 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -4242,7 +4242,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 

diff --git a/doc/po/de.po b/doc/po/de.po
index bc8d8c899baad14f03223ca525be232a5fa2b3ad..4f001b85e71d2c451c0b1510efbc180f744157ac 100644 (file)
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -6071,11 +6071,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

diff --git a/doc/po/es.po b/doc/po/es.po
index 5cba392d4848f21fee8abd1a90b957fa9f78b803..84dd3a127d0ff8ded6fd3ca57c09eb258f1b5ec3 100644 (file)
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.7.1\n"
+"Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-11-06 09:45+0100\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
@@ -6126,11 +6126,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

diff --git a/doc/po/fr.po b/doc/po/fr.po
index 66f5e39c3080902dcdb1c6ec2d75e6ba3eb83275..d1e60a655af1322e7d1b3b8bef39e12c1714011e 100644 (file)
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
 # Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2014-11-15 17:26+0100\n"
@@ -6045,11 +6045,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

diff --git a/doc/po/it.po b/doc/po/it.po
index 21fbebd93d3191a219b5b966cd5d6b1aaff04e75..af5fa2914c0e62ed197019bf3de7a5314df8633d 100644 (file)
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -8,7 +8,7 @@
 # Beatrice Torracca <beatricet@libero.it>, 2012, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-10 09:48+0100\n"
 "PO-Revision-Date: 2015-01-27 14:11+0200\n"
@@ -6072,11 +6072,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

diff --git a/doc/po/ja.po b/doc/po/ja.po
index ba72f0d027b85b7b55445d77180b3b3e092f67ed..a74d2af3aa7d990985cf28f2cd9d13d8922e60f6 100644 (file)
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,7 +6,7 @@
 # KURASAWA Nozomu, 2003-2006, 2009-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.0.6\n"
+"Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-11-06 09:45+0100\n"
 "PO-Revision-Date: 2014-07-10 19:52+0900\n"
@@ -5812,11 +5812,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

diff --git a/doc/po/pl.po b/doc/po/pl.po
index 8081be57bd7e966c6d3136f9e8d93276f079db2c..229ac02c11b52ca5af30232c2a73b76f337ecf0e 100644 (file)
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -9,7 +9,7 @@
 # Robert Luberda <robert@debian.org> 2000-2004, 2010, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.9.7.3\n"
+"Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-11-06 09:45+0100\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
@@ -5509,11 +5509,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 702cae479a653007e517aad04dbc79efe9d9666d..35efdfe3089ca29b7f352e6c16bdc544bf5e1bdc 100644 (file)
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -5,7 +5,7 @@
 # Américo Monteiro <a_monteiro@gmx.com>, 2009 - 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.0.7\n"
+"Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-11-06 09:45+0100\n"
 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
@@ -6007,11 +6007,11 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 5f03f7dac0aed4369b3ac46ffacb85ad8f7fd6b9..9a9f8ec5604e27a7f188745617a8ec4bad033a15 100644 (file)
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2014-11-06 09:45+0100\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
@@ -4393,7 +4393,7 @@ msgstr ""
 #, fuzzy, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "<programlisting>\n"

diff --git a/dselect/install b/dselect/install
index 7104ee280cd74399ded16413023f840fe583492d..75f0c0fc4bf2300751c247b6725305cdc9c07329 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -49,7 +49,7 @@ yesno() {
 
 if [ "$WAIT" = "true" ]; then
    $APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" -d dselect-upgrade
-   echo $"Press enter to continue." && read RES
+   echo $"Press [Enter] to continue." && read RES
    $APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade
    RES=$?
 else
@@ -65,7 +65,7 @@ fi
 # Finished OK
 if [ $RES -eq 0 ]; then
 
-   if [ $(ls $ARCHIVES $ARCHIVES/partial | egrep -v "^lock$|^partial$" | wc -l) \
+   if [ $(ls $ARCHIVES $ARCHIVES/partial | grep -E -v "^lock$|^partial$" | wc -l) \
         -eq 0 ]; then
       exit 0
    fi
@@ -81,18 +81,18 @@ if [ $RES -eq 0 ]; then
    case $(echo $CLEAN | tr '[:upper:]' '[:lower:]') in
      auto)
        $APTGET "$APT_OPT0" "$APT_OPT1" autoclean &&
-          echo $"Press enter to continue." && read RES && exit 0;
+          echo $"Press [Enter] to continue." && read RES && exit 0;
        ;;
      always)
        $APTGET "$APT_OPT0" "$APT_OPT1" clean &&
-          echo $"Press enter to continue." && read RES && exit 0;
+          echo $"Press [Enter] to continue." && read RES && exit 0;
        ;;
      prompt)
        exec 3>&1
        echo -n $"Do you want to erase any previously downloaded .deb files?"
        if [ $(yesno "" y) = y ]; then
           $APTGET "$APT_OPT0" "$APT_OPT1" clean &&
-           echo $"Press enter to continue." && read RES && exit 0;
+           echo $"Press [Enter] to continue." && read RES && exit 0;
        fi
        ;;
      *) 
@@ -103,7 +103,7 @@ else
    echo $"will be configured. This may result in duplicate errors"
    echo $"or errors caused by missing dependencies. This is OK, only the errors"
    echo $"above this message are important. Please fix them and run [I]nstall again"
-   echo $"Press enter to continue."
+   echo $"Press [Enter] to continue."
    read RES && $DPKG "$DPKG_OPTS" --configure -a
    exit 100
 fi

diff --git a/dselect/update b/dselect/update
index 487fbf226d1ab253b576e2b4285da709b838e57b..0ab317ee40654bd2f6d6bc59c21b2da47c8e4931 100755 (executable)
--- a/dselect/update
+++ b/dselect/update
@@ -42,7 +42,7 @@ then
 fi
 
 if [ x$PROMPT = "xtrue" ]; then
-   echo $"Press enter to continue." && read RES;
+   echo $"Press [Enter] to continue." && read RES;
 fi
 
 exit $STATUS

diff --git a/methods/rsh.cc b/methods/rsh.cc
index 52349c61c54d6b2054bc4937012b980f8e5c2e1f..7ef2f7c7a62a415afba77ce8def2286213fa621d 100644 (file)
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -84,7 +84,7 @@ bool RSHConn::Open()
    if (Process != -1)
       return true;
 
-   if (Connect(ServerName.Host,ServerName.User) == false)
+   if (Connect(ServerName.Host,ServerName.Port,ServerName.User) == false)
       return false;
 
    return true;
@@ -93,8 +93,15 @@ bool RSHConn::Open()
 // RSHConn::Connect - Fire up rsh and connect                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool RSHConn::Connect(std::string Host, std::string User)
+bool RSHConn::Connect(std::string Host, unsigned int Port, std::string User)
 {
+   char *PortStr = NULL;
+   if (Port != 0)
+   {
+      if (asprintf (&PortStr, "%d", Port) == -1 || PortStr == NULL)
+         return _error->Errno("asprintf", _("Failed"));
+   }
+
    // Create the pipes
    int Pipes[4] = {-1,-1,-1,-1};
    if (pipe(Pipes) != 0 || pipe(Pipes+2) != 0)
@@ -140,6 +147,10 @@ bool RSHConn::Connect(std::string Host, std::string User)
          Args[i++] = "-l";
         Args[i++] = User.c_str();
       }
+      if (PortStr != NULL) {
+         Args[i++] = "-p";
+         Args[i++] = PortStr;
+      }
       if (Host.empty() == false) {
          Args[i++] = Host.c_str();
       }
@@ -149,6 +160,9 @@ bool RSHConn::Connect(std::string Host, std::string User)
       exit(100);
    }
 
+   if (PortStr != NULL)
+      free(PortStr);
+
    ReadFd = Pipes[0];
    WriteFd = Pipes[3];
    SetNonBlock(Pipes[0],true);
@@ -157,6 +171,10 @@ bool RSHConn::Connect(std::string Host, std::string User)
    close(Pipes[2]);
    
    return true;
+}
+bool RSHConn::Connect(std::string Host, std::string User)
+{
+   return Connect(Host, 0, User);
 }
                                                                        /*}}}*/
 // RSHConn::ReadLine - Very simple buffered read with timeout          /*{{{*/

diff --git a/methods/rsh.h b/methods/rsh.h
index 34492971c32f87b3eecfff72b7b421a6b0d576df..e6839711bc95cc887030c61cc10359adbbb8f153 100644 (file)
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -36,6 +36,7 @@ class RSHConn
    // Raw connection IO
    bool WriteMsg(std::string &Text,bool Sync,const char *Fmt,...);
    bool Connect(std::string Host, std::string User);
+   bool Connect(std::string Host, unsigned int Port, std::string User);
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
 
    // Connection control

diff --git a/po/apt-all.pot b/po/apt-all.pot
index e2d09401bbbb47931908ee33bac4f7f565169781..4a70213f406dd757f1e14f01aca9985ee485377b 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -200,7 +200,7 @@ msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
 #: cmdline/apt-cdrom.cc:92
-msgid "Please insert a Disc in the drive and press enter"
+msgid "Please insert a Disc in the drive and press [Enter]"
 msgstr ""
 
 #: cmdline/apt-cdrom.cc:140
@@ -1563,7 +1563,7 @@ msgstr ""
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
-"in the drive '%s' and press enter\n"
+"in the drive '%s' and press [Enter]\n"
 msgstr ""
 
 #. Only warn if there are no sources.list.d.
@@ -1623,7 +1623,7 @@ msgstr ""
 
 #: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
 #: dselect/install:106 dselect/update:45
-msgid "Press enter to continue."
+msgid "Press [Enter] to continue."
 msgstr ""
 
 #: dselect/install:92
@@ -2057,7 +2057,7 @@ msgstr ""
 
 #: apt-pkg/acquire-worker.cc:485
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
 msgstr ""
 
 #: apt-pkg/cachefile.cc:94

diff --git a/po/ar.po b/po/ar.po
index 8c1622d910c582aa04370daa0315f982d7ea30f0..9bf40386fe570457d1fc34690acfa446e2d9e0be 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -4,7 +4,7 @@
 # Ossama M. Khayat <okhayat@yahoo.com>, 2005, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"

diff --git a/po/cs.po b/po/cs.po
index 4de2b7006f5cca99fbb99f748bc2f58366e10ad2..2c732fc29a0c316c79f57950a105d2235117a69c 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2014-10-05 06:09+0200\n"

diff --git a/po/cy.po b/po/cy.po
index db9ec0bbc3cb2ee501a4519d0e0b8254fd8006db..7d2d6366ea1432591cbbdb7a9d2211f85e6ee8ee 100644 (file)
--- a/po/cy.po
+++ b/po/cy.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: APT\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"

diff --git a/po/dz.po b/po/dz.po
index e27ea6a90544eb60f63748fd15fc98deb851c12b..12b6499f151a1390c8c448245df3f080e6fb039e 100644 (file)
--- a/po/dz.po
+++ b/po/dz.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po.pot\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"

diff --git a/po/el.po b/po/el.po
index b2370c6ad3cc66ccdec5fb264a79b5e66b2c2c20..bc3a784b974a84b7892720a8477add82b42c44df 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -14,7 +14,7 @@
 # Θανάσης Νάτσης <natsisthanasis@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_el\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"

diff --git a/po/eu.po b/po/eu.po
index 528c6cc51cb2498131f122fbee6d198c44313cee..9e164703563d767dd8d50e98fb4557c9004bfe60 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 # Piarres Beobide <pi@beobide.net>, 2005, 2006, 2007, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_eu\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2009-05-17 00:41+0200\n"

diff --git a/po/fr.po b/po/fr.po
index 2d28ab42b76420d9e73c1ec88371fc38b6c3f58a..eb41bb221c9d927dfbe22e87673aee07886e5ca8 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 # Julien Patriarca <leatherface@debian.org>, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: fr\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2013-12-15 16:45+0100\n"

diff --git a/po/gl.po b/po/gl.po
index 9ec10122bd65d07bff2a461c4b2098f86f9534f7..9ad26c4e757fc0584f78525f790c1621bb6f4da1 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_gl\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2011-05-12 15:28+0100\n"

diff --git a/po/hu.po b/po/hu.po
index fcf53f7274b6465c4bd9fd44546cf13136f123ee..9475a9f420d83ba2ff50d8b24408c5140c5ac2f5 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2004, 2005, 2011, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt trunk\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2012-06-25 17:09+0200\n"

diff --git a/po/it.po b/po/it.po
index 6d9793c559b62036edc18606bdfe23ad15bb735d..ca7a1102755c2db6d4d5054d5f406f5949fd225b 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-04-11 08:08+0200\n"
 "PO-Revision-Date: 2015-04-07 16:51+0100\n"

diff --git a/po/km.po b/po/km.po
index 8ae605510185a3e6dbd411276537a94b3d083d2d..263c30dea2f840f7453b36295a42fefff5e58080 100644 (file)
--- a/po/km.po
+++ b/po/km.po
@@ -8,7 +8,7 @@
 # Khoem Sokhem <khoemsokhem@khmeros.info>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_km\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"

diff --git a/po/ko.po b/po/ko.po
index e5b08fdec5e81a39ba488eaf4e754c63166b76ae..969736cca7f7f6381714b6fb89a9a50810e0460b 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2010-08-30 02:31+0900\n"

diff --git a/po/ku.po b/po/ku.po
index 3b2d6ed12b565277cf1aece36f0791d7c0379d67..f6683663425dcb16a86f02ae2fcc5f7e696c0a29 100644 (file)
--- a/po/ku.po
+++ b/po/ku.po
@@ -6,7 +6,7 @@
 # Erdal Ronahi <erdal dot ronahi at gmail dot com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-ku\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2008-05-08 12:48+0200\n"

diff --git a/po/lt.po b/po/lt.po
index 6d0365183296a1d20e3413d118a493e1479657a1..67ff3c8fb0129009074296891a5b830f4d5b0902 100644 (file)
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2008-08-02 01:47-0400\n"

diff --git a/po/mr.po b/po/mr.po
index 31bdb63c9d11fc3b9420c746cbad24fa3d00c9cb..69c133592767232c39664d5f057deb9dc0047b28 100644 (file)
--- a/po/mr.po
+++ b/po/mr.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2008-11-20 23:27+0530\n"

diff --git a/po/ne.po b/po/ne.po
index b5fb2c6fca67f3925310ecb3a6bb4ec7f1fb1ba0..83ffc1d376952c9529a2f56721b013c6a807c36d 100644 (file)
--- a/po/ne.po
+++ b/po/ne.po
@@ -4,7 +4,7 @@
 # Shiva Pokharel <pokharelshiva@hotmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2006-06-12 14:35+0545\n"

diff --git a/po/nn.po b/po/nn.po
index 5c8c399670b3c2b8685581baafbee00049a828a3..1f079e98aa8727d591ef285e1949d7a655eef5dc 100644 (file)
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_nn\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"

diff --git a/po/pt.po b/po/pt.po
index 0e106a7d157dbd568a05dfe9832285027cc31498..28b8be56300e13e38c944758a340e91c825c0b3a 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 # Miguel Figueiredo <elmig@debianpt.org>, 2005-2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2012-06-29 15:45+0100\n"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index c50792b79fe890dd38c2aa49d4be183bfa6dd4e6..ad8c325c472a3f431cc6ec4aa1cc965c34e4f6fe 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 # Felipe Augusto van de Wiel (faw) <faw@debian.org>, 2006-2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2008-11-17 02:33-0200\n"

diff --git a/po/ro.po b/po/ro.po
index 7b94bd3d8dee238d11e462e1f748f58106cbc393..68628517b103f07c75e138d222f550679ee0ba1b 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@
 # Eddy Petrișor <eddy.petrisor@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: ro\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2008-11-15 02:21+0200\n"

diff --git a/po/sk.po b/po/sk.po
index 0aeb167ea8efd30d63a14bdc79097c51f21a1d03..776b139c1b7747329b0279053c3a42c850c65795 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2012-06-28 20:49+0100\n"

diff --git a/po/sv.po b/po/sv.po
index bdf00ff658ec7c59ac14e760aee717ef3f39a963..7e7801f8409201e40e5de0166ce5247eaf031aa1 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2010-08-24 21:18+0100\n"

diff --git a/po/th.po b/po/th.po
index c016205c5f48cde45506b100449834bf2a264c20..731b1de46ea7c6b1bbd1e281f80f698c808e14a2 100644 (file)
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2014-12-12 13:00+0700\n"

diff --git a/po/tl.po b/po/tl.po
index be33717046486260a41c02319dcd3e114ef53b4e..d6e1059e8fca5f814af5aa7c3dfad539ebdea5e4 100644 (file)
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2007-03-29 21:36+0800\n"

diff --git a/po/tr.po b/po/tr.po
index 8b8691a5542251a26a6944d674f4a56c2d2ce3e4..5a5c4fcd5aebdc4c3a7b6916902c66ace2e7c0cc 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 # Rosetta Contributors, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-04-13 07:23+0200\n"
 "PO-Revision-Date: 2015-06-21 16:54+0200\n"

diff --git a/po/uk.po b/po/uk.po
index 514403641cad161374c8662d3db6df5d24e0789f..1494413e9555cdcd2c1e35c5fdcd7eb26a9b1876 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@
 # binary = двійковий
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-all\n"
+"Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2012-09-25 20:19+0300\n"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index f37e5e0ede39f98378d248a60b357cf5087bbcb8..6b78c8340a07ef1579ba6b599db1f774682cbb86 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 # $Id: zh_TW.po,v 1.11 2004/04/30 04:50:38 mdz Exp $
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.5.4\n"
+"Project-Id-Version: apt 0.5.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2009-01-28 10:41+0800\n"

diff --git a/prepare-release b/prepare-release
index 734dc5f322de35f5bcde8adbda5662068a91b836..91f65028d4bb202be4b4a3a162f4f5bb6dd1b173 100755 (executable)
--- a/prepare-release
+++ b/prepare-release
@@ -11,7 +11,7 @@ VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p')
 DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p')
 
 LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/contrib/macros.h | sed 's/\.$//')"
-LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
+LIBAPTINSTVERSION="$(grep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
 
 librarysymbolsfromfile() {
        local MISSING="$(grep '^+#MISSING' "$1")"

diff --git a/test/integration/framework b/test/integration/framework
index 2efe7439e423e132b0e7503792cbe60f49dac6fa..b443f2a7b48432d03901fe37f7e1d991f8513b38 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1377,8 +1377,17 @@ testsuccess() {
                if expr match "$1" '^apt.*' >/dev/null; then
                        if grep -q -E ' runtime error: ' "$OUTPUT"; then
                                msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"
-                       elif grep -q -E '^[WE]: ' "$OUTPUT"; then
-                               msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
+                       elif grep -E '^[WE]: ' "$OUTPUT" > "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" 2>&1; then
+                               if [ "$IGNORE_PTY_NOT_MOUNTED" = '1' ]; then
+                                       if echo 'E: Can not write log (Is /dev/pts mounted?) - posix_openpt (2: No such file or directory)' \
+                                               | cmp - "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" >/dev/null 2>&1; then
+                                               msgpass
+                                       else
+                                               msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
+                                       fi
+                               else
+                                       msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
+                               fi
                        else
                                msgpass
                        fi

diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index 108805daadfd9eb9aad8d6174919109512d0f310..ce31b5934830a9a7e0b76120435ee02fc712ce3f 100755 (executable)
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -38,7 +38,7 @@ aptautotest_aptcdromlog_add() { aptautotest_aptget_update "$@"; }
 CDROM_PRE="Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/
 Unmounting CD-ROM...
 Waiting for disc...
-Please insert a Disc in the drive and press enter 
+Please insert a Disc in the drive and press [Enter] 
 Mounting CD-ROM...
 Scanning disc for index files..."
 CDROM_POST="This disc is called: 

diff --git a/test/integration/test-apt-download-progress b/test/integration/test-apt-download-progress
index 7caeca971f230fe7421d33c16e867dd52fdd8970..bf6a412ad63d9240077197e3bd7e98748dfc71f9 100755 (executable)
--- a/test/integration/test-apt-download-progress
+++ b/test/integration/test-apt-download-progress
@@ -13,7 +13,7 @@ changetohttpswebserver
 assertprogress() {
     T="$1"
     testsuccess grep "dlstatus:1:0:Retrieving file 1 of 1" "$T"
-    if ! egrep -q "dlstatus:1:[1-9][0-9](\..*)?:Retrieving file 1 of 1" "$T"; then
+    if ! grep -E -q "dlstatus:1:[1-9][0-9](\..*)?:Retrieving file 1 of 1" "$T"; then
         cat "$T"
         msgfail "Failed to detect download progress"
     fi

diff --git a/test/integration/test-apt-update-filesize-mismatch b/test/integration/test-apt-update-filesize-mismatch
index f78b83b5ff6d1ca858fbe303db948e810235ff49..a23c03c3f47477f10f604d5dc364d6087f3d6598 100755 (executable)
--- a/test/integration/test-apt-update-filesize-mismatch
+++ b/test/integration/test-apt-update-filesize-mismatch
@@ -40,7 +40,7 @@ for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.
 
                testfailure aptget update -o Debug::pkgAcquire::Worker=1
                cp rootdir/tmp/testfailure.output rootdir/tmp/update.output
-               testsuccess grep -E "$(basename -s '.gz' "$COMPRESSFILE").*Hash Sum mismatch" rootdir/tmp/update.output
+               testsuccess grep -E "$(basename "$COMPRESSFILE" '.gz').*Hash Sum mismatch" rootdir/tmp/update.output
                testfailure aptcache show foo
                testfailure aptget install foo -s
 

diff --git a/test/integration/test-apt-update-hashsum-mismatch b/test/integration/test-apt-update-hashsum-mismatch
index c2c5b388797d57c9aea4ee0b778fb128859605e8..4627f7afd04ce8988b8dbb8379f422c0366f68a0 100755 (executable)
--- a/test/integration/test-apt-update-hashsum-mismatch
+++ b/test/integration/test-apt-update-hashsum-mismatch
@@ -35,7 +35,7 @@ for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.
 
        testfailure aptget update
        cp rootdir/tmp/testfailure.output rootdir/tmp/update.output
-       testsuccess grep -E "$(basename -s '.gz' "$get").*Hash Sum mismatch" rootdir/tmp/update.output
+       testsuccess grep -E "$(basename "$get" '.gz').*Hash Sum mismatch" rootdir/tmp/update.output
        testfailure aptcache show foo
        testfailure aptget install foo -s