diff options
| author | Adrien Nader <adrien@notk.org> | 2011-04-07 08:15:08 +0200 |
|---|---|---|
| committer | Adrien Nader <adrien@notk.org> | 2011-04-07 08:15:08 +0200 |
| commit | 22817c01fc2255886f27363d226433c771de7f99 (patch) | |
| tree | 7137de5e42b3024860c4ef93097e5835333ab019 /slackware64-current/source/a/pkgtools | |
| parent | ada3f8834d2086ec32a3ce6beac503482a95ac04 (diff) | |
Thu Apr 7 04:07:29 UTC 2011
a/mdadm-3.1.5-x86_64-1.txz: Upgraded.
a/pkgtools-13.37-noarch-5.tgz: Rebuilt.
Use du -sh to calculate package sizes.
l/pango-1.28.4-x86_64-1.txz: Upgraded.
n/dhcp-4.2.1_P1-x86_64-1.txz: Upgraded.
In dhclient, check the data for some string options for reasonableness
before passing it along to the script that interfaces with the OS.
This prevents some possible attacks by a hostile DHCP server.
For more information, see:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-0997
(* Security fix *)
testing/source/linux-2.6.38.2-configs/: Upgraded.
testing/source/linux-2.6.39-rc2-configs/: Upgraded.
Diffstat (limited to 'slackware64-current/source/a/pkgtools')
| -rwxr-xr-x | slackware64-current/source/a/pkgtools/pkgtools.SlackBuild | 2 | ||||
| -rw-r--r-- | slackware64-current/source/a/pkgtools/scripts/installpkg | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild b/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild index 07f0b6ed5..01be6969c 100755 --- a/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild +++ b/slackware64-current/source/a/pkgtools/pkgtools.SlackBuild @@ -29,7 +29,7 @@ PKG=$TMP/package-pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=13.37 ARCH=${ARCH:-noarch} -BUILD=4 +BUILD=5 if [ ! -d $TMP ]; then mkdir -p $TMP # location to build the source diff --git a/slackware64-current/source/a/pkgtools/scripts/installpkg b/slackware64-current/source/a/pkgtools/scripts/installpkg index 82bf60f95..ef88b7a9f 100644 --- a/slackware64-current/source/a/pkgtools/scripts/installpkg +++ b/slackware64-current/source/a/pkgtools/scripts/installpkg @@ -391,19 +391,7 @@ for package in $* ; do # Figure out some package information, like the compressed and uncompressed # sizes, and where to find the package description: - COMPRESSED="$(du -s $package | cut -f 1)" - # There's no way $COMPRESSED could be non-numeric here, right? - if [ ! -z "$(echo $COMPRESSED | tr -d 0-9)" ]; then - # Can't happen, so set it to something random. - COMPRESSED=47 - fi - if [ $COMPRESSED -lt 1000 ]; then - COMPRESSED="${COMPRESSED}K" - elif [ $COMPRESSED -lt 10000 ]; then - COMPRESSED="$(expr $COMPRESSED \* 1000 / 1024 | cut -b1).$(expr $COMPRESSED \* 1000 / 1024 | cut -b2)M" - else - COMPRESSED="$(expr $COMPRESSED / 1024)M" - fi + COMPRESSED="$(/bin/du -sh $package | cut -f 1)" DESCRIPTION="" # First check for .txt file next to the package, since this is faster: if grep "^$packagebase:" "$packagedir/$shortname.txt" 1> /dev/null 2> /dev/null ; then |