March 2006 - crux-commits

r1004 - crux-2.2/iso/bin
by crux＠crux.nu 25 Mar '06

25 Mar '06

Author: jw Date: 2006-03-25 11:48:07 +0100 (Sat, 25 Mar 2006) New Revision: 1004 Modified: crux-2.2/iso/bin/setup-helper Log: take care of firefox' additional dependencies Modified: crux-2.2/iso/bin/setup-helper =================================================================== --- crux-2.2/iso/bin/setup-helper 2006-03-24 22:01:41 UTC (rev 1003) +++ crux-2.2/iso/bin/setup-helper 2006-03-25 10:48:07 UTC (rev 1004) @@ -87,3 +87,8 @@ remove_packages devfsd inject_packages udev pciutils libusb usbutils hotplug rename_packages "pkgconfig:pkg-config" + + +if [ `pkginfo -r $ROOT -i|gawk '{ print $1; }'|grep ^firefox$` ]; then + inject_packages cairo glitz pango hicolor-icon-theme +fi

1 0

r1003 - crux-2.2/iso/bin
by crux＠crux.nu 24 Mar '06

24 Mar '06

Author: jw Date: 2006-03-24 23:01:41 +0100 (Fri, 24 Mar 2006) New Revision: 1003 Modified: crux-2.2/iso/bin/setup Log: show dialog while running setup-helper Modified: crux-2.2/iso/bin/setup =================================================================== --- crux-2.2/iso/bin/setup 2006-03-24 13:43:38 UTC (rev 1002) +++ crux-2.2/iso/bin/setup 2006-03-24 22:01:41 UTC (rev 1003) @@ -229,7 +229,10 @@ select_packages confirm if [ "$ACTION" = "UPGRADE" ] && [ -f /usr/bin/setup-helper ]; then - /usr/bin/setup-helper $ROOT &> $helperlogfile + ( + /usr/bin/setup-helper $ROOT &> $helperlogfile + ) | do_dialog --title " Please wait [2.1 -> 2.2 check]" \ + --gauge "" 8 60 0 fi install_packages

1 0

r1002 - crux-2.2/iso/bin
by crux＠crux.nu 24 Mar '06

24 Mar '06

Author: jw Date: 2006-03-24 14:43:38 +0100 (Fri, 24 Mar 2006) New Revision: 1002 Added: crux-2.2/iso/bin/setup-helper Modified: crux-2.2/iso/bin/setup Log: add setup-helper to do rename/inject/remove packages Modified: crux-2.2/iso/bin/setup =================================================================== --- crux-2.2/iso/bin/setup 2006-03-24 10:38:13 UTC (rev 1001) +++ crux-2.2/iso/bin/setup 2006-03-24 13:43:38 UTC (rev 1002) @@ -228,12 +228,18 @@ select_root select_packages confirm + if [ "$ACTION" = "UPGRADE" ] && [ -f /usr/bin/setup-helper ]; then + /usr/bin/setup-helper $ROOT &> $helperlogfile + fi install_packages + + cat $helperlogfile } tmpfile=/tmp/tmp.$$ pkgfile=/tmp/packages.$$ logfile=/tmp/log.$$ +helperlogfile=/tmp/log-helper.$$ crux_dir=/crux trap "rm -f $tmpfile $pkgfile" 0 1 2 5 15 Added: crux-2.2/iso/bin/setup-helper =================================================================== --- crux-2.2/iso/bin/setup-helper (rev 0) +++ crux-2.2/iso/bin/setup-helper 2006-03-24 13:43:38 UTC (rev 1002) @@ -0,0 +1,89 @@ +#!/bin/bash +# post setup +# +# Johannes Winkelmann, jw at tks6 dot net + +ROOT=$1 +DB=$ROOT/var/lib/pkg/db + +## those values should be changed: +TMPDB=$DB.tmp +BACKUPDB=$DB.backup +PKGADD="pkgadd" +PKGRM="pkgrm" +MV="mv" + +rename_packages() { + echo "* Packages renamed: " + + if [ -z "$1" ]; then + return + fi + pkg=$@ + + filter="sed " + for tuple in $@; do + split=($(echo $tuple|sed -e 's|:| |')) + if [ -n "${split[1]}" ] && [ `pkginfo -r $ROOT -i|gawk '{ print $1; }'|grep ^${split[0]}$` ]; then + echo " ${split[0]} -> ${split[1]}" + filter="$filter -e 's|^${split[0]}$|${split[1]}|'" + fi + done + + :> $TMPDB + if [ -f $DB ]; then + nextIsName=1 + cat $DB|while read l; do + if [ $nextIsName -eq 1 ]; then + nextIsName=0 + echo $l|eval $filter >> $TMPDB + else + if [ "$l" = "" ]; then + nextIsName=1 + fi + echo $l >> $TMPDB + fi + done + fi + + $MV $DB $BACKUPDB + $MV $TMPDB $DB +} + + +remove_packages() { + echo "* Packages removed (obsolete):" + for package in $@; do + if [ `pkginfo -r $ROOT -i|gawk '{ print $1; }'|grep ^$package$` ]; then + echo " $package" + $PKGRM -r $ROOT $package + fi + done +} + +inject_packages() { + echo "* Packaged injected:" + for package in $@; do + if [ -z "`pkginfo -r $ROOT -i|gawk '{ print $1; }'|grep ^$package$`" ]; then + echo " $package" + pkg="`find core opt -name \"${package}#*.pkg.tar.gz\" &2> /dev/null`" + if [ -n "$pkg" ]; then + $PKGADD -r $ROOT -f $pkg + else + echo " ERROR: package $package not found on ISO" + fi + fi + done +} + +#################### + +if [ -z "$1" ]; then + echo "Usage: $0 <root>" + exit -1 +fi + +# 2.1 -> 2.2 +remove_packages devfsd +inject_packages udev pciutils libusb usbutils hotplug +rename_packages "pkgconfig:pkg-config" Property changes on: crux-2.2/iso/bin/setup-helper ___________________________________________________________________ Name: svn:executable + *

1 0

r1001 - crux-2.1/ports/opt/maradns crux-2.2/ports/opt/maradns
by crux＠crux.nu 24 Mar '06

24 Mar '06

Author: jue Date: 2006-03-24 11:38:13 +0100 (Fri, 24 Mar 2006) New Revision: 1001 Removed: crux-2.1/ports/opt/maradns/db.0.0.127 crux-2.2/ports/opt/maradns/db.0.0.127 Modified: crux-2.1/ports/opt/maradns/.footprint crux-2.1/ports/opt/maradns/.md5sum crux-2.1/ports/opt/maradns/Pkgfile crux-2.1/ports/opt/maradns/db.localhost crux-2.1/ports/opt/maradns/mararc crux-2.2/ports/opt/maradns/.footprint crux-2.2/ports/opt/maradns/.md5sum crux-2.2/ports/opt/maradns/Pkgfile crux-2.2/ports/opt/maradns/db.localhost crux-2.2/ports/opt/maradns/mararc Log: maradns: update to 1.2.07.1 Modified: crux-2.1/ports/opt/maradns/.footprint =================================================================== --- crux-2.1/ports/opt/maradns/.footprint 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.1/ports/opt/maradns/.footprint 2006-03-24 10:38:13 UTC (rev 1001) @@ -1,6 +1,5 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/maradns/ --rw-r--r-- root/root etc/maradns/db.0.0.127 -rw-r--r-- root/root etc/maradns/db.example.net -rw-r--r-- root/root etc/maradns/db.localhost drwxr-xr-x root/root etc/maradns/logger/ Modified: crux-2.1/ports/opt/maradns/.md5sum =================================================================== --- crux-2.1/ports/opt/maradns/.md5sum 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.1/ports/opt/maradns/.md5sum 2006-03-24 10:38:13 UTC (rev 1001) @@ -1,5 +1,4 @@ -fdc4078e6394d43e49a1cdae07edbb46 db.0.0.127 -7d8ba321d7776dc8aef8fd834b77253e db.localhost +6e2f5cfb258b8955fa345a2070b6c4b0 db.localhost 020d9bffda1f19fa9287c80672554ecf maradns -5a30f37bb84db7382e1a905ed79d8e70 maradns-1.2.03.4.tar.bz2 -80edc6970d4e64d524c19632061a56c0 mararc +a581e296960bbe8c609d4f8dd6849369 maradns-1.2.07.1.tar.bz2 +076b7f38266892690d472b5d8d8b63d3 mararc Modified: crux-2.1/ports/opt/maradns/Pkgfile =================================================================== --- crux-2.1/ports/opt/maradns/Pkgfile 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.1/ports/opt/maradns/Pkgfile 2006-03-24 10:38:13 UTC (rev 1001) @@ -4,10 +4,10 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=maradns -version=1.2.03.4 +version=1.2.07.1 release=1 source=(http://www.maradns.org/download/1.2/$version/maradns-$version.tar.b… \ - mararc maradns db.localhost db.0.0.127) + mararc maradns db.localhost) build () { cd maradns-$version Deleted: crux-2.1/ports/opt/maradns/db.0.0.127 =================================================================== --- crux-2.1/ports/opt/maradns/db.0.0.127 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.1/ports/opt/maradns/db.0.0.127 2006-03-24 10:38:13 UTC (rev 1001) @@ -1,14 +0,0 @@ -# -# /etc/maradns/db.0.0.127 -# - -# SOA -% SOA localhost. root@localhost. 1 7200 3600 604800 1800 - -# NS -% NS localhost. - -# PTR -1.% PTR localhost. - -# End of file Modified: crux-2.1/ports/opt/maradns/db.localhost =================================================================== --- crux-2.1/ports/opt/maradns/db.localhost 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.1/ports/opt/maradns/db.localhost 2006-03-24 10:38:13 UTC (rev 1001) @@ -3,12 +3,12 @@ # # SOA -% SOA localhost. root@localhost. 1 7200 3600 604800 1800 +% SOA localhost. root@localhost. 1 7200 3600 604800 1800 # NS -% NS localhost. +% NS localhost. -# A -% A 127.0.0.1 +# FQDN4 +% FQDN4 127.0.0.1 # End of file Modified: crux-2.1/ports/opt/maradns/mararc =================================================================== --- crux-2.1/ports/opt/maradns/mararc 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.1/ports/opt/maradns/mararc 2006-03-24 10:38:13 UTC (rev 1001) @@ -26,7 +26,6 @@ # The various zones we support csv2 = {} csv2["localhost."] = "db.localhost" -csv2["0.0.127.in-addr.arpa."] = "db.0.0.127" # csv2["example.net."] = "db.example.net" # ACL for localhost, localnet @@ -36,6 +35,7 @@ ipv4_alias["localnet"] = "192.168.0.0/24" recursive_acl = "localhost,localnet" zone_transfer_acl = "localnet" +admin_acl = "localhost,localnet" # The root servers which we use when making recursive queries. # http://www.icann.org Modified: crux-2.2/ports/opt/maradns/.footprint =================================================================== --- crux-2.2/ports/opt/maradns/.footprint 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.2/ports/opt/maradns/.footprint 2006-03-24 10:38:13 UTC (rev 1001) @@ -1,6 +1,5 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/maradns/ --rw-r--r-- root/root etc/maradns/db.0.0.127 -rw-r--r-- root/root etc/maradns/db.example.net -rw-r--r-- root/root etc/maradns/db.localhost drwxr-xr-x root/root etc/maradns/logger/ Modified: crux-2.2/ports/opt/maradns/.md5sum =================================================================== --- crux-2.2/ports/opt/maradns/.md5sum 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.2/ports/opt/maradns/.md5sum 2006-03-24 10:38:13 UTC (rev 1001) @@ -1,5 +1,4 @@ -fdc4078e6394d43e49a1cdae07edbb46 db.0.0.127 -7d8ba321d7776dc8aef8fd834b77253e db.localhost +6e2f5cfb258b8955fa345a2070b6c4b0 db.localhost 020d9bffda1f19fa9287c80672554ecf maradns -5a30f37bb84db7382e1a905ed79d8e70 maradns-1.2.03.4.tar.bz2 -80edc6970d4e64d524c19632061a56c0 mararc +a581e296960bbe8c609d4f8dd6849369 maradns-1.2.07.1.tar.bz2 +076b7f38266892690d472b5d8d8b63d3 mararc Modified: crux-2.2/ports/opt/maradns/Pkgfile =================================================================== --- crux-2.2/ports/opt/maradns/Pkgfile 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.2/ports/opt/maradns/Pkgfile 2006-03-24 10:38:13 UTC (rev 1001) @@ -4,10 +4,10 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=maradns -version=1.2.03.4 +version=1.2.07.1 release=1 source=(http://www.maradns.org/download/1.2/$version/maradns-$version.tar.b… \ - mararc maradns db.localhost db.0.0.127) + mararc maradns db.localhost) build () { cd maradns-$version Deleted: crux-2.2/ports/opt/maradns/db.0.0.127 =================================================================== --- crux-2.2/ports/opt/maradns/db.0.0.127 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.2/ports/opt/maradns/db.0.0.127 2006-03-24 10:38:13 UTC (rev 1001) @@ -1,14 +0,0 @@ -# -# /etc/maradns/db.0.0.127 -# - -# SOA -% SOA localhost. root@localhost. 1 7200 3600 604800 1800 - -# NS -% NS localhost. - -# PTR -1.% PTR localhost. - -# End of file Modified: crux-2.2/ports/opt/maradns/db.localhost =================================================================== --- crux-2.2/ports/opt/maradns/db.localhost 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.2/ports/opt/maradns/db.localhost 2006-03-24 10:38:13 UTC (rev 1001) @@ -3,12 +3,12 @@ # # SOA -% SOA localhost. root@localhost. 1 7200 3600 604800 1800 +% SOA localhost. root@localhost. 1 7200 3600 604800 1800 # NS -% NS localhost. +% NS localhost. -# A -% A 127.0.0.1 +# FQDN4 +% FQDN4 127.0.0.1 # End of file Modified: crux-2.2/ports/opt/maradns/mararc =================================================================== --- crux-2.2/ports/opt/maradns/mararc 2006-03-24 10:35:57 UTC (rev 1000) +++ crux-2.2/ports/opt/maradns/mararc 2006-03-24 10:38:13 UTC (rev 1001) @@ -26,7 +26,6 @@ # The various zones we support csv2 = {} csv2["localhost."] = "db.localhost" -csv2["0.0.127.in-addr.arpa."] = "db.0.0.127" # csv2["example.net."] = "db.example.net" # ACL for localhost, localnet @@ -36,6 +35,7 @@ ipv4_alias["localnet"] = "192.168.0.0/24" recursive_acl = "localhost,localnet" zone_transfer_acl = "localnet" +admin_acl = "localhost,localnet" # The root servers which we use when making recursive queries. # http://www.icann.org

1 0

r1000 - crux-2.1/ports/opt/ssmtp crux-2.2/ports/opt/ssmtp
by crux＠crux.nu 24 Mar '06

24 Mar '06

Author: jue Date: 2006-03-24 11:35:57 +0100 (Fri, 24 Mar 2006) New Revision: 1000 Modified: crux-2.1/ports/opt/ssmtp/.md5sum crux-2.1/ports/opt/ssmtp/Pkgfile crux-2.2/ports/opt/ssmtp/.md5sum crux-2.2/ports/opt/ssmtp/Pkgfile Log: ssmtp: update to 2.61-pl6 Modified: crux-2.1/ports/opt/ssmtp/.md5sum =================================================================== --- crux-2.1/ports/opt/ssmtp/.md5sum 2006-03-23 17:23:54 UTC (rev 999) +++ crux-2.1/ports/opt/ssmtp/.md5sum 2006-03-24 10:35:57 UTC (rev 1000) @@ -1,2 +1,2 @@ -87389d8bd11374184b76f0861fefdf77 ssmtp_2.61-5.diff.gz +e4fbbd7cf8b46421bfab7b2f43d9c70f ssmtp_2.61-6.diff.gz 957e6fff08625fe34f4fc33d0925bbc9 ssmtp_2.61.orig.tar.gz Modified: crux-2.1/ports/opt/ssmtp/Pkgfile =================================================================== --- crux-2.1/ports/opt/ssmtp/Pkgfile 2006-03-23 17:23:54 UTC (rev 999) +++ crux-2.1/ports/opt/ssmtp/Pkgfile 2006-03-24 10:35:57 UTC (rev 1000) @@ -5,13 +5,13 @@ name=ssmtp version=2.61 -release=2 +release=3 source=(http://ftp.debian.org/debian/pool/main/s/$name/${name}_${version}.o… \ - http://ftp.debian.org/debian/pool/main/s/$name/${name}_${version}-5.diff.gz) + http://ftp.debian.org/debian/pool/main/s/$name/${name}_${version}-6.diff.gz) build () { cd $name-$version - gunzip -c $SRC/${name}_${version}-5.diff.gz | patch -p1 + gunzip -c $SRC/${name}_${version}-6.diff.gz | patch -p1 autoconf ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -22,6 +22,7 @@ sed -i "s|_HOSTNAME_|`hostname -f`|" ssmtp.conf sed -i "s|/etc/ssmtp.conf|/etc/ssmtp/ssmtp.conf|" ssmtp.conf + sed -i '39i\\n#AuthUser=\n#AuthPass=' ssmtp.conf sed -i "s|/usr/lib/|/usr/sbin/|" ssmtp.8 install -D -m 644 ssmtp.conf $PKG/etc/ssmtp/ssmtp.conf Modified: crux-2.2/ports/opt/ssmtp/.md5sum =================================================================== --- crux-2.2/ports/opt/ssmtp/.md5sum 2006-03-23 17:23:54 UTC (rev 999) +++ crux-2.2/ports/opt/ssmtp/.md5sum 2006-03-24 10:35:57 UTC (rev 1000) @@ -1,2 +1,2 @@ -87389d8bd11374184b76f0861fefdf77 ssmtp_2.61-5.diff.gz +e4fbbd7cf8b46421bfab7b2f43d9c70f ssmtp_2.61-6.diff.gz 957e6fff08625fe34f4fc33d0925bbc9 ssmtp_2.61.orig.tar.gz Modified: crux-2.2/ports/opt/ssmtp/Pkgfile =================================================================== --- crux-2.2/ports/opt/ssmtp/Pkgfile 2006-03-23 17:23:54 UTC (rev 999) +++ crux-2.2/ports/opt/ssmtp/Pkgfile 2006-03-24 10:35:57 UTC (rev 1000) @@ -5,13 +5,13 @@ name=ssmtp version=2.61 -release=2 +release=3 source=(http://ftp.debian.org/debian/pool/main/s/$name/${name}_${version}.o… \ - http://ftp.debian.org/debian/pool/main/s/$name/${name}_${version}-5.diff.gz) + http://ftp.debian.org/debian/pool/main/s/$name/${name}_${version}-6.diff.gz) build () { cd $name-$version - gunzip -c $SRC/${name}_${version}-5.diff.gz | patch -p1 + gunzip -c $SRC/${name}_${version}-6.diff.gz | patch -p1 autoconf ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -22,6 +22,7 @@ sed -i "s|_HOSTNAME_|`hostname -f`|" ssmtp.conf sed -i "s|/etc/ssmtp.conf|/etc/ssmtp/ssmtp.conf|" ssmtp.conf + sed -i '39i\\n#AuthUser=\n#AuthPass=' ssmtp.conf sed -i "s|/usr/lib/|/usr/sbin/|" ssmtp.8 install -D -m 644 ssmtp.conf $PKG/etc/ssmtp/ssmtp.conf

1 0

r999 - crux-2.1/ports/core/libtiff
by crux＠crux.nu 23 Mar '06

23 Mar '06

Author: jw Date: 2006-03-23 18:23:54 +0100 (Thu, 23 Mar 2006) New Revision: 999 Modified: crux-2.1/ports/core/libtiff/.footprint crux-2.1/ports/core/libtiff/.md5sum crux-2.1/ports/core/libtiff/Pkgfile Log: Update libtiff to 3.8.2 Modified: crux-2.1/ports/core/libtiff/.footprint =================================================================== --- crux-2.1/ports/core/libtiff/.footprint 2006-03-23 17:18:31 UTC (rev 998) +++ crux-2.1/ports/core/libtiff/.footprint 2006-03-23 17:23:54 UTC (rev 999) @@ -8,14 +8,14 @@ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libtiff.a -rwxr-xr-x root/root usr/lib/libtiff.la -lrwxrwxrwx root/root usr/lib/libtiff.so -> libtiff.so.3.8.1 -lrwxrwxrwx root/root usr/lib/libtiff.so.3 -> libtiff.so.3.8.1 --rwxr-xr-x root/root usr/lib/libtiff.so.3.8.1 +lrwxrwxrwx root/root usr/lib/libtiff.so -> libtiff.so.3.8.2 +lrwxrwxrwx root/root usr/lib/libtiff.so.3 -> libtiff.so.3.8.2 +-rwxr-xr-x root/root usr/lib/libtiff.so.3.8.2 -rw-r--r-- root/root usr/lib/libtiffxx.a -rwxr-xr-x root/root usr/lib/libtiffxx.la -lrwxrwxrwx root/root usr/lib/libtiffxx.so -> libtiffxx.so.3.8.1 -lrwxrwxrwx root/root usr/lib/libtiffxx.so.3 -> libtiffxx.so.3.8.1 --rwxr-xr-x root/root usr/lib/libtiffxx.so.3.8.1 +lrwxrwxrwx root/root usr/lib/libtiffxx.so -> libtiffxx.so.3.8.2 +lrwxrwxrwx root/root usr/lib/libtiffxx.so.3 -> libtiffxx.so.3.8.2 +-rwxr-xr-x root/root usr/lib/libtiffxx.so.3.8.2 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/TIFFClose.3tiff.gz Modified: crux-2.1/ports/core/libtiff/.md5sum =================================================================== --- crux-2.1/ports/core/libtiff/.md5sum 2006-03-23 17:18:31 UTC (rev 998) +++ crux-2.1/ports/core/libtiff/.md5sum 2006-03-23 17:23:54 UTC (rev 999) @@ -1 +1 @@ -edd4a2036f6f315d26170178f0f8641e tiff-3.8.1.tar.gz +fbb6f446ea4ed18955e2714934e5b698 tiff-3.8.2.tar.gz Modified: crux-2.1/ports/core/libtiff/Pkgfile =================================================================== --- crux-2.1/ports/core/libtiff/Pkgfile 2006-03-23 17:18:31 UTC (rev 998) +++ crux-2.1/ports/core/libtiff/Pkgfile 2006-03-23 17:23:54 UTC (rev 999) @@ -4,7 +4,7 @@ # Depends on: libjpeg, zlib name=libtiff -version=3.8.1 +version=3.8.2 release=1 source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-$version.tar.gz)

1 0

r998 - crux-2.2
by crux＠crux.nu 23 Mar '06

23 Mar '06

Author: jw Date: 2006-03-23 18:18:31 +0100 (Thu, 23 Mar 2006) New Revision: 998 Modified: crux-2.2/ChangeLog Log: ChangeLog: libtiff Modified: crux-2.2/ChangeLog =================================================================== --- crux-2.2/ChangeLog 2006-03-23 17:17:28 UTC (rev 997) +++ crux-2.2/ChangeLog 2006-03-23 17:18:31 UTC (rev 998) @@ -66,7 +66,7 @@ - opt/freetype 2.1.9-1 -> 2.1.10-1 - opt/glib 2.6.4-1 -> 2.8.6-1 - opt/gtk 2.6.7-1 -> 2.8.11-1 - - opt/libtiff 3.8.0-1 -> 3.8.1-1 + - opt/libtiff 3.8.0-1 -> 3.8.2-1 - opt/mdadm 1.9.0-1 -> 2.3.1-1 - opt/pango 1.8.1-1 -> 1.10.3-1 - opt/windowmaker 0.91.0-1 -> 0.92.0-2

1 0

r997 - crux-2.2/ports/opt/libtiff
by crux＠crux.nu 23 Mar '06

23 Mar '06

Author: jw Date: 2006-03-23 18:17:28 +0100 (Thu, 23 Mar 2006) New Revision: 997 Modified: crux-2.2/ports/opt/libtiff/.footprint crux-2.2/ports/opt/libtiff/.md5sum crux-2.2/ports/opt/libtiff/Pkgfile Log: update libtiff to 3.8.2 Modified: crux-2.2/ports/opt/libtiff/.footprint =================================================================== --- crux-2.2/ports/opt/libtiff/.footprint 2006-03-23 11:18:04 UTC (rev 996) +++ crux-2.2/ports/opt/libtiff/.footprint 2006-03-23 17:17:28 UTC (rev 997) @@ -8,14 +8,14 @@ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libtiff.a -rwxr-xr-x root/root usr/lib/libtiff.la -lrwxrwxrwx root/root usr/lib/libtiff.so -> libtiff.so.3.8.1 -lrwxrwxrwx root/root usr/lib/libtiff.so.3 -> libtiff.so.3.8.1 --rwxr-xr-x root/root usr/lib/libtiff.so.3.8.1 +lrwxrwxrwx root/root usr/lib/libtiff.so -> libtiff.so.3.8.2 +lrwxrwxrwx root/root usr/lib/libtiff.so.3 -> libtiff.so.3.8.2 +-rwxr-xr-x root/root usr/lib/libtiff.so.3.8.2 -rw-r--r-- root/root usr/lib/libtiffxx.a -rwxr-xr-x root/root usr/lib/libtiffxx.la -lrwxrwxrwx root/root usr/lib/libtiffxx.so -> libtiffxx.so.3.8.1 -lrwxrwxrwx root/root usr/lib/libtiffxx.so.3 -> libtiffxx.so.3.8.1 --rwxr-xr-x root/root usr/lib/libtiffxx.so.3.8.1 +lrwxrwxrwx root/root usr/lib/libtiffxx.so -> libtiffxx.so.3.8.2 +lrwxrwxrwx root/root usr/lib/libtiffxx.so.3 -> libtiffxx.so.3.8.2 +-rwxr-xr-x root/root usr/lib/libtiffxx.so.3.8.2 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/TIFFClose.3tiff.gz Modified: crux-2.2/ports/opt/libtiff/.md5sum =================================================================== --- crux-2.2/ports/opt/libtiff/.md5sum 2006-03-23 11:18:04 UTC (rev 996) +++ crux-2.2/ports/opt/libtiff/.md5sum 2006-03-23 17:17:28 UTC (rev 997) @@ -1 +1 @@ -edd4a2036f6f315d26170178f0f8641e tiff-3.8.1.tar.gz +fbb6f446ea4ed18955e2714934e5b698 tiff-3.8.2.tar.gz Modified: crux-2.2/ports/opt/libtiff/Pkgfile =================================================================== --- crux-2.2/ports/opt/libtiff/Pkgfile 2006-03-23 11:18:04 UTC (rev 996) +++ crux-2.2/ports/opt/libtiff/Pkgfile 2006-03-23 17:17:28 UTC (rev 997) @@ -4,7 +4,7 @@ # Depends on: libjpeg, zlib name=libtiff -version=3.8.1 +version=3.8.2 release=1 source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-$version.tar.gz)

1 0

r996 - crux-2.2/ports/core/shadow
by crux＠crux.nu 23 Mar '06

23 Mar '06

Author: jw Date: 2006-03-23 12:18:04 +0100 (Thu, 23 Mar 2006) New Revision: 996 Added: crux-2.2/ports/core/shadow/shadow-4.0.15-noshadowgrp.diff Removed: crux-2.2/ports/core/shadow/shadow-4.0.15-nochgpasswd.diff Modified: crux-2.2/ports/core/shadow/.footprint crux-2.2/ports/core/shadow/.md5sum crux-2.2/ports/core/shadow/Pkgfile Log: shadow (2.2): fix chgpasswd to work with --disable-shadowgrp Modified: crux-2.2/ports/core/shadow/.footprint =================================================================== --- crux-2.2/ports/core/shadow/.footprint 2006-03-23 07:51:21 UTC (rev 995) +++ crux-2.2/ports/core/shadow/.footprint 2006-03-23 11:18:04 UTC (rev 996) @@ -55,6 +55,7 @@ -rw-r--r-- root/root usr/man/man8/vigr.8.gz -rw-r--r-- root/root usr/man/man8/vipw.8.gz drwxr-xr-x root/root usr/sbin/ +-rwxr-xr-x root/root usr/sbin/chgpasswd -rwxr-xr-x root/root usr/sbin/groupadd -rwxr-xr-x root/root usr/sbin/groupdel -rwxr-xr-x root/root usr/sbin/groupmod Modified: crux-2.2/ports/core/shadow/.md5sum =================================================================== --- crux-2.2/ports/core/shadow/.md5sum 2006-03-23 07:51:21 UTC (rev 995) +++ crux-2.2/ports/core/shadow/.md5sum 2006-03-23 11:18:04 UTC (rev 996) @@ -1,4 +1,4 @@ d52af1b47b7a382bff9d0be6865f05ea login.defs be8f69c2701118093af3d7f3bc02af16 pwck -29b6b4f6083d841ea01f68b6f1a9137c shadow-4.0.15-nochgpasswd.diff +01bab2b152b8f2ae0056a467fa365797 shadow-4.0.15-noshadowgrp.diff a0452fa989f8ba45023cc5a08136568e shadow-4.0.15.tar.bz2 Modified: crux-2.2/ports/core/shadow/Pkgfile =================================================================== --- crux-2.2/ports/core/shadow/Pkgfile 2006-03-23 07:51:21 UTC (rev 995) +++ crux-2.2/ports/core/shadow/Pkgfile 2006-03-23 11:18:04 UTC (rev 996) @@ -6,17 +6,18 @@ version=4.0.15 release=1 source=(ftp://ftp.pld.org.pl/software/shadow/$name-$version.tar.bz2 \ - pwck login.defs shadow-4.0.15-nochgpasswd.diff) + pwck login.defs shadow-4.0.15-noshadowgrp.diff) build() { cd $name-$version + patch -p1 < $SRC/shadow-4.0.15-noshadowgrp.diff + ./configure --prefix=/usr \ --mandir=/usr/man \ --disable-shared \ --disable-shadowgrp \ --disable-nls \ --without-selinux - patch src/Makefile $SRC/shadow-4.0.15-nochgpasswd.diff make make DESTDIR=$PKG install mkdir -p $PKG/etc/cron/daily $PKG/var/log Deleted: crux-2.2/ports/core/shadow/shadow-4.0.15-nochgpasswd.diff =================================================================== --- crux-2.2/ports/core/shadow/shadow-4.0.15-nochgpasswd.diff 2006-03-23 07:51:21 UTC (rev 995) +++ crux-2.2/ports/core/shadow/shadow-4.0.15-nochgpasswd.diff 2006-03-23 11:18:04 UTC (rev 996) @@ -1,64 +0,0 @@ ---- Makefile.orig 2006-03-23 00:28:27.083554080 +0100 -+++ Makefile 2006-03-23 00:29:04.600850584 +0100 -@@ -40,7 +40,7 @@ - ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \ - chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \ - newgrp$(EXEEXT) passwd$(EXEEXT) --usbin_PROGRAMS = chgpasswd$(EXEEXT) chpasswd$(EXEEXT) \ -+usbin_PROGRAMS = chpasswd$(EXEEXT) \ - groupadd$(EXEEXT) groupdel$(EXEEXT) groupmod$(EXEEXT) \ - grpck$(EXEEXT) grpconv$(EXEEXT) grpunconv$(EXEEXT) \ - logoutd$(EXEEXT) newusers$(EXEEXT) nologin$(EXEEXT) \ -@@ -76,10 +76,6 @@ - chfn_OBJECTS = chfn.$(OBJEXT) - chfn_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_2) --chgpasswd_SOURCES = chgpasswd.c --chgpasswd_OBJECTS = chgpasswd.$(OBJEXT) --chgpasswd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ -- $(am__DEPENDENCIES_2) - chpasswd_SOURCES = chpasswd.c - chpasswd_OBJECTS = chpasswd.$(OBJEXT) - chpasswd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ -@@ -206,13 +202,13 @@ - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = chage.c chfn.c chgpasswd.c chpasswd.c chsh.c expiry.c \ -+SOURCES = chage.c chfn.c chpasswd.c chsh.c expiry.c \ - faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c \ - grpck.c grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \ - logoutd.c newgrp.c newusers.c nologin.c passwd.c pwck.c \ - pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c \ - userdel.c usermod.c vipw.c --DIST_SOURCES = chage.c chfn.c chgpasswd.c chpasswd.c chsh.c expiry.c \ -+DIST_SOURCES = chage.c chfn.c chpasswd.c chsh.c expiry.c \ - faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c \ - grpck.c grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \ - logoutd.c newgrp.c newusers.c nologin.c passwd.c pwck.c \ -@@ -366,7 +362,6 @@ - AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" - chage_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) - chfn_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) --chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) - chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) - chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) - gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) -@@ -527,9 +522,6 @@ - chfn$(EXEEXT): $(chfn_OBJECTS) $(chfn_DEPENDENCIES) - @rm -f chfn$(EXEEXT) - $(LINK) $(chfn_LDFLAGS) $(chfn_OBJECTS) $(chfn_LDADD) $(LIBS) --chgpasswd$(EXEEXT): $(chgpasswd_OBJECTS) $(chgpasswd_DEPENDENCIES) -- @rm -f chgpasswd$(EXEEXT) -- $(LINK) $(chgpasswd_LDFLAGS) $(chgpasswd_OBJECTS) $(chgpasswd_LDADD) $(LIBS) - chpasswd$(EXEEXT): $(chpasswd_OBJECTS) $(chpasswd_DEPENDENCIES) - @rm -f chpasswd$(EXEEXT) - $(LINK) $(chpasswd_LDFLAGS) $(chpasswd_OBJECTS) $(chpasswd_LDADD) $(LIBS) -@@ -626,7 +618,6 @@ - - include ./$(DEPDIR)/chage.Po - include ./$(DEPDIR)/chfn.Po --include ./$(DEPDIR)/chgpasswd.Po - include ./$(DEPDIR)/chpasswd.Po - include ./$(DEPDIR)/chsh.Po - include ./$(DEPDIR)/expiry.Po Added: crux-2.2/ports/core/shadow/shadow-4.0.15-noshadowgrp.diff =================================================================== --- crux-2.2/ports/core/shadow/shadow-4.0.15-noshadowgrp.diff (rev 0) +++ crux-2.2/ports/core/shadow/shadow-4.0.15-noshadowgrp.diff 2006-03-23 11:18:04 UTC (rev 996) @@ -0,0 +1,127 @@ +--- shadow-4.0.15.orig/src/chgpasswd.c 2006-03-23 11:10:24.000000000 +0100 ++++ shadow-4.0.15/src/chgpasswd.c 2006-03-23 11:55:18.000000000 +0100 +@@ -43,7 +43,9 @@ + #include "nscd.h" + #include "prototypes.h" + #include "groupio.h" ++#ifdef SHADOWGRP + #include "sgroupio.h" ++#endif + /* + * Global variables + */ +@@ -51,7 +53,9 @@ + static int eflg = 0; + static int md5flg = 0; + +-static int is_shadow_pwd; ++#ifdef SHADOWGRP ++static int is_shadow_grp; ++#endif + + /* local function prototypes */ + static void usage (void); +@@ -78,8 +82,10 @@ + char *newpwd; + char *cp; + ++#ifdef SHADOWGRP + const struct sgrp *sg; + struct sgrp newsg; ++#endif + + const struct group *gr; + struct group newgr; +@@ -179,8 +185,9 @@ + exit (1); + } + +- is_shadow_pwd = sgr_file_present (); +- if (is_shadow_pwd) { ++#ifdef SHADOWGRP ++ is_shadow_grp = sgr_file_present (); ++ if (is_shadow_grp) { + if (!sgr_lock ()) { + fprintf (stderr, _("%s: can't lock gshadow file\n"), + Prog); +@@ -195,6 +202,7 @@ + exit (1); + } + } ++#endif + + /* + * Read each line, separating the group name from the password. The +@@ -254,33 +262,33 @@ + errors++; + continue; + } +- if (is_shadow_pwd) +- sg = sgr_locate (name); +- else +- sg = NULL; ++#ifdef SHADOWGRP ++ sg = sgr_locate (name); ++#endif + + /* + * The freshly encrypted new password is merged into the + * user's password file entry and the last password change + * date is set to the current date. + */ +- if (sg) { +- newsg = *sg; +- newsg.sg_passwd = cp; +- } else { +- newgr = *gr; +- newgr.gr_passwd = cp; +- } ++#ifdef SHADOWGRP ++ newsg = *sg; ++ newsg.sg_passwd = cp; ++#else ++ newgr = *gr; ++ newgr.gr_passwd = cp; ++#endif + + /* + * The updated password file entry is then put back and will + * be written to the password file later, after all the + * other entries have been updated as well. + */ +- if (sg) ++#ifdef SHADOWGRP + ok = sgr_update (&newsg); +- else ++#else + ok = gr_update (&newgr); ++#endif + + if (!ok) { + fprintf (stderr, +@@ -302,12 +310,15 @@ + if (errors) { + fprintf (stderr, + _("%s: error detected, changes ignored\n"), Prog); +- if (is_shadow_pwd) ++#ifdef SHADOWGRP ++ if (is_shadow_grp) + sgr_unlock (); ++#endif + gr_unlock (); + exit (1); + } +- if (is_shadow_pwd) { ++#ifdef SHADOWGRP ++ if (is_shadow_grp) { + if (!sgr_close ()) { + fprintf (stderr, + _("%s: error updating shadow file\n"), Prog); +@@ -316,6 +327,7 @@ + } + sgr_unlock (); + } ++#endif + if (!gr_close ()) { + fprintf (stderr, _("%s: error updating password file\n"), Prog); + exit (1);

1 0

r995 - crux-2.2
by crux＠crux.nu 23 Mar '06

23 Mar '06

Author: jw Date: 2006-03-23 08:51:21 +0100 (Thu, 23 Mar 2006) New Revision: 995 Modified: crux-2.2/ChangeLog Log: changelog (2.2): update sendmail and shadow Modified: crux-2.2/ChangeLog =================================================================== --- crux-2.2/ChangeLog 2006-03-23 03:22:12 UTC (rev 994) +++ crux-2.2/ChangeLog 2006-03-23 07:51:21 UTC (rev 995) @@ -141,8 +141,8 @@ - base/readline 4.3-2 -> 5.0-1 - base/reiserfsprogs 3.6.17-1 -> 3.6.19-1 - base/sed 4.0.9-1 -> 4.1.4-2 - - base/sendmail 8.12.11-3 -> 8.13.4-1 - - base/shadow 4.0.4.1-1 -> 4.0.7-2 + - base/sendmail 8.12.11-3 -> 8.13.6-1 + - base/shadow 4.0.4.1-1 -> 4.0.15-1 - base/sysklogd 1.4.1-3 -> 1.4.1-5 - base/sysvinit 2.85-1 -> 2.86-2 - base/tar 1.14-1 -> 1.15.1-2

1 0