- crux-commits - lists.crux.nu

r1691 - crux-2.2/ports/opt/dovecot
by crux＠crux.nu 04 Aug '06

04 Aug '06

Author: jue Date: 2006-08-04 17:06:27 +0200 (Fri, 04 Aug 2006) New Revision: 1691 Modified: crux-2.2/ports/opt/dovecot/.footprint crux-2.2/ports/opt/dovecot/.md5sum crux-2.2/ports/opt/dovecot/Pkgfile crux-2.2/ports/opt/dovecot/dovecot-config.patch Log: dovecot: update to 1.0.rc5 Modified: crux-2.2/ports/opt/dovecot/.footprint =================================================================== --- crux-2.2/ports/opt/dovecot/.footprint 2006-08-04 15:05:43 UTC (rev 1690) +++ crux-2.2/ports/opt/dovecot/.footprint 2006-08-04 15:06:27 UTC (rev 1691) @@ -57,6 +57,8 @@ -rwxr-xr-x root/root usr/sbin/dovecot -rwxr-xr-x root/root usr/sbin/dovecotpw drwxr-xr-x root/root var/ +drwxr-xr-x root/root var/lib/ +drwxr-x--- root/root var/lib/dovecot/ drwxr-xr-x root/root var/run/ drwxr-xr-x root/root var/run/dovecot/ drwxr-x--- root/dovecot var/run/dovecot/login/ Modified: crux-2.2/ports/opt/dovecot/.md5sum =================================================================== --- crux-2.2/ports/opt/dovecot/.md5sum 2006-08-04 15:05:43 UTC (rev 1690) +++ crux-2.2/ports/opt/dovecot/.md5sum 2006-08-04 15:06:27 UTC (rev 1691) @@ -1,3 +1,3 @@ 1c37d911bc42fb40f0ef5a3f5822b170 dovecot -e27a248b2ee224e4618aa2f020150041 dovecot-1.0.rc2.tar.gz -e3da0d0e1b22a3ae93c93e6f6d8c0437 dovecot-config.patch +c54cc01f70a4666d99708f3068c8cc28 dovecot-1.0.rc5.tar.gz +b35d66018fadc55adb5aceac747af417 dovecot-config.patch Modified: crux-2.2/ports/opt/dovecot/Pkgfile =================================================================== --- crux-2.2/ports/opt/dovecot/Pkgfile 2006-08-04 15:05:43 UTC (rev 1690) +++ crux-2.2/ports/opt/dovecot/Pkgfile 2006-08-04 15:06:27 UTC (rev 1691) @@ -4,7 +4,7 @@ # Depends on: openssl name=dovecot -version=1.0.rc2 +version=1.0.rc5 release=1 source=(http://dovecot.procontrol.fi/releases/$name-$version.tar.gz \ dovecot-config.patch dovecot) @@ -18,6 +18,7 @@ --sysconfdir=/etc \ --localstatedir=/var \ --with-moduledir=/usr/lib/dovecot/modules \ + --with-ioloop=epoll \ --enable-ipv6 \ --with-ssl=openssl \ --with-pop3d @@ -33,7 +34,7 @@ touch $PKG/etc/ssl/keys/dovecot.key chmod 0600 $PKG/etc/ssl/{keys/dovecot.key,certs/dovecot.crt} - install -d $PKG/var/run/dovecot/login - chmod 0750 $PKG/var/run/dovecot/login - chown root:dovecot $PKG/var/run/dovecot/login + install -d $PKG/var/{run,lib}/dovecot + install -d -m 0750 -o root -g dovecot $PKG/var/run/dovecot/login + chmod 0750 $PKG/var/lib/dovecot } Modified: crux-2.2/ports/opt/dovecot/dovecot-config.patch =================================================================== --- crux-2.2/ports/opt/dovecot/dovecot-config.patch 2006-08-04 15:05:43 UTC (rev 1690) +++ crux-2.2/ports/opt/dovecot/dovecot-config.patch 2006-08-04 15:06:27 UTC (rev 1691) @@ -1,6 +1,6 @@ -diff -Nru dovecot-1.0.rc2.orig/dovecot-example.conf dovecot-1.0.rc2/dovecot-example.conf ---- dovecot-1.0.rc2.orig/dovecot-example.conf 2006-07-04 20:13:50.000000000 +0200 -+++ dovecot-1.0.rc2/dovecot-example.conf 2006-07-04 20:13:59.000000000 +0200 +diff -Nru dovecot-1.0.rc3.orig/dovecot-example.conf dovecot-1.0.rc3/dovecot-example.conf +--- dovecot-1.0.rc3.orig/dovecot-example.conf 2006-08-02 19:46:43.000000000 +0200 ++++ dovecot-1.0.rc3/dovecot-example.conf 2006-08-02 19:46:56.000000000 +0200 @@ -13,10 +13,10 @@ # --with-ssldir=/etc/ssl @@ -66,7 +66,7 @@ # If you need to set multiple mailbox locations or want to change default # namespace settings, you can do it by defining namespace sections: -@@ -294,7 +294,7 @@ +@@ -295,7 +295,7 @@ # non-valid GID as primary group ID aren't allowed to log in. If user # belongs to supplementary groups with non-valid GIDs, those groups are # not set. @@ -75,7 +75,7 @@ #last_valid_gid = 0 # Maximum number of running mail processes. When this limit is reached, -@@ -467,19 +467,19 @@ +@@ -468,19 +468,19 @@ protocol imap { # Login executable location. @@ -99,7 +99,7 @@ # Maximum IMAP command line length in bytes. Some clients generate very long # command lines with huge mailboxes, so you may need to raise this if you get -@@ -529,10 +529,10 @@ +@@ -530,10 +530,10 @@ protocol pop3 { # Login executable location. @@ -112,7 +112,7 @@ # Don't try to set mails non-recent or seen with POP3 sessions. This is # mostly intended to reduce disk I/O. With maildir it doesn't move files -@@ -576,7 +576,7 @@ +@@ -577,7 +577,7 @@ # installations. %08Xu%08Xv will be the new default, so use it for new # installations. # @@ -121,7 +121,7 @@ # POP3 logout format string: # %t - number of TOP commands -@@ -622,7 +622,7 @@ +@@ -623,7 +623,7 @@ #mail_plugin_dir = /usr/lib/dovecot/lda # Binary to use for sending mails. @@ -130,7 +130,7 @@ # UNIX socket path to master authentication server to find users. #auth_socket_path = /var/run/dovecot/auth-master -@@ -633,7 +633,7 @@ +@@ -634,7 +634,7 @@ ## # Executable location @@ -139,7 +139,7 @@ # Set max. process size in megabytes. #auth_process_size = 256 -@@ -745,7 +745,7 @@ +@@ -746,7 +746,7 @@ # database (passwd usually), you can use static userdb. # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM # authentication to actually work. @@ -148,7 +148,7 @@ # [session=yes] [setcred=yes] [cache_key=<key>] [<service name>] # # session=yes makes Dovecot open and immediately close PAM session. Some -@@ -773,7 +773,7 @@ +@@ -774,7 +774,7 @@ # args = session=yes * # args = cache_key=%u dovecot #args = dovecot @@ -157,7 +157,7 @@ # /etc/passwd or similar, using getpwnam() # In many systems nowadays this uses Name Service Switch, which is -@@ -782,8 +782,8 @@ +@@ -783,8 +783,8 @@ #} # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays. @@ -168,7 +168,7 @@ # BSD authentication. Used by at least OpenBSD. #passdb bsdauth { -@@ -885,7 +885,7 @@ +@@ -886,7 +886,7 @@ # authentication with BSDs internally accesses shadow files, which also # requires roots. Note that this user is NOT used to access mails. # That user is specified by userdb above.

1 0

r1690 - crux-2.2/ports/opt/mysql
by crux＠crux.nu 04 Aug '06

04 Aug '06

Author: jue Date: 2006-08-04 17:05:43 +0200 (Fri, 04 Aug 2006) New Revision: 1690 Modified: crux-2.2/ports/opt/mysql/.footprint crux-2.2/ports/opt/mysql/.md5sum crux-2.2/ports/opt/mysql/Pkgfile Log: mysql: update to 5.0.24 Modified: crux-2.2/ports/opt/mysql/.footprint =================================================================== --- crux-2.2/ports/opt/mysql/.footprint 2006-08-04 15:05:07 UTC (rev 1689) +++ crux-2.2/ports/opt/mysql/.footprint 2006-08-04 15:05:43 UTC (rev 1690) @@ -113,6 +113,7 @@ -rw-r--r-- root/root usr/man/man1/mysql.1.gz -rw-r--r-- root/root usr/man/man1/mysql.server.1.gz -rw-r--r-- root/root usr/man/man1/mysql_config.1.gz +-rw-r--r-- root/root usr/man/man1/mysql_explain_log.1.gz -rw-r--r-- root/root usr/man/man1/mysql_fix_privilege_tables.1.gz -rw-r--r-- root/root usr/man/man1/mysql_upgrade.1.gz -rw-r--r-- root/root usr/man/man1/mysql_zap.1.gz @@ -139,7 +140,6 @@ drwxr-xr-x root/root usr/share/mysql/ drwxr-xr-x root/root usr/share/mysql/charsets/ -rw-r--r-- root/root usr/share/mysql/charsets/Index.xml --rw-r--r-- root/root usr/share/mysql/charsets/README -rw-r--r-- root/root usr/share/mysql/charsets/armscii8.xml -rw-r--r-- root/root usr/share/mysql/charsets/ascii.xml -rw-r--r-- root/root usr/share/mysql/charsets/cp1250.xml Modified: crux-2.2/ports/opt/mysql/.md5sum =================================================================== --- crux-2.2/ports/opt/mysql/.md5sum 2006-08-04 15:05:07 UTC (rev 1689) +++ crux-2.2/ports/opt/mysql/.md5sum 2006-08-04 15:05:43 UTC (rev 1690) @@ -1,3 +1,3 @@ c92bf44516b82cad857fb386dbb64bfe my.cnf -ed31b2c270a14f4bc8347ddbca1722d8 mysql-5.0.23.tar.gz +df7026f7d5daf7fbcf5e684c534cec15 mysql-5.0.24.tar.gz 642a596f13ebd7e459c5ff2fd382f06b mysqld Modified: crux-2.2/ports/opt/mysql/Pkgfile =================================================================== --- crux-2.2/ports/opt/mysql/Pkgfile 2006-08-04 15:05:07 UTC (rev 1689) +++ crux-2.2/ports/opt/mysql/Pkgfile 2006-08-04 15:05:43 UTC (rev 1690) @@ -4,7 +4,7 @@ # Depends on: ncurses, zlib name=mysql -version=5.0.23 +version=5.0.24 release=1 source=(http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/$name-$version.tar.gz \ my.cnf mysqld) @@ -26,6 +26,7 @@ make DESTDIR=$PKG install rm -r $PKG/usr/mysql-test + rm $PKG/usr/share/mysql/charsets/README find $PKG/usr/share/mysql/* -prune -type f ! -regex '.*$cnf\|sql$$' | xargs rm -f {} \; find $PKG/usr/share/mysql/* -type d ! -name english ! -name charsets | xargs rm -rf {} \;

1 0

r1689 - crux-2.2/ports/opt/phpmyadmin
by crux＠crux.nu 04 Aug '06

04 Aug '06

Author: jue Date: 2006-08-04 17:05:07 +0200 (Fri, 04 Aug 2006) New Revision: 1689 Modified: crux-2.2/ports/opt/phpmyadmin/.footprint crux-2.2/ports/opt/phpmyadmin/.md5sum crux-2.2/ports/opt/phpmyadmin/Pkgfile Log: phpmyadmin: update to 2.8.2.1 Modified: crux-2.2/ports/opt/phpmyadmin/.footprint =================================================================== --- crux-2.2/ports/opt/phpmyadmin/.footprint 2006-08-04 14:47:34 UTC (rev 1688) +++ crux-2.2/ports/opt/phpmyadmin/.footprint 2006-08-04 15:05:07 UTC (rev 1689) @@ -129,7 +129,6 @@ -rw-r--r-- root/root var/www/phpmyadmin/libraries/header_printview.inc.php -rw-r--r-- root/root var/www/phpmyadmin/libraries/import.lib.php drwxr-xr-x root/root var/www/phpmyadmin/libraries/import/ --rw-r--r-- root/root var/www/phpmyadmin/libraries/import/README -rw-r--r-- root/root var/www/phpmyadmin/libraries/import/csv.php -rw-r--r-- root/root var/www/phpmyadmin/libraries/import/ldi.php -rw-r--r-- root/root var/www/phpmyadmin/libraries/import/sql.php Modified: crux-2.2/ports/opt/phpmyadmin/.md5sum =================================================================== --- crux-2.2/ports/opt/phpmyadmin/.md5sum 2006-08-04 14:47:34 UTC (rev 1688) +++ crux-2.2/ports/opt/phpmyadmin/.md5sum 2006-08-04 15:05:07 UTC (rev 1689) @@ -1 +1 @@ -c4a08948d9e461c917ae20f26976aa6e phpMyAdmin-2.8.2.tar.bz2 +dd11f126650c88eda95c4b719663811f phpMyAdmin-2.8.2.1.tar.bz2 Modified: crux-2.2/ports/opt/phpmyadmin/Pkgfile =================================================================== --- crux-2.2/ports/opt/phpmyadmin/Pkgfile 2006-08-04 14:47:34 UTC (rev 1688) +++ crux-2.2/ports/opt/phpmyadmin/Pkgfile 2006-08-04 15:05:07 UTC (rev 1689) @@ -5,7 +5,7 @@ # Depends on: mod_php name=phpmyadmin -version=2.8.2 +version=2.8.2.1 release=1 source=(http://dl.sourceforge.net/sourceforge/$name/phpMyAdmin-$version.tar… @@ -14,7 +14,7 @@ cp -R phpMyAdmin-$version $PKG/var/www/phpmyadmin cd $PKG/var/www/phpmyadmin rm -r scripts test - rm libraries/{fpdf,transformations}/README + rm libraries/{fpdf,transformations,import}/README find lang/* -path "*/english*.inc.php" -or -exec rm {} \; find -maxdepth 1 -type f | egrep -v '.*php|.*html|.*css' | xargs rm find -type f -exec chmod -x {} \;

1 0

r1688 - crux-2.2/ports/opt/xxdiff
by crux＠crux.nu 04 Aug '06

04 Aug '06

Author: jw Date: 2006-08-04 16:47:34 +0200 (Fri, 04 Aug 2006) New Revision: 1688 Removed: crux-2.2/ports/opt/xxdiff/xxdiff-cvs-fix.diff Modified: crux-2.2/ports/opt/xxdiff/.footprint crux-2.2/ports/opt/xxdiff/.md5sum crux-2.2/ports/opt/xxdiff/Pkgfile crux-2.2/ports/opt/xxdiff/xxdiff-nostyleforce.diff Log: xxdiff: update to 3.2 Modified: crux-2.2/ports/opt/xxdiff/.footprint =================================================================== --- crux-2.2/ports/opt/xxdiff/.footprint 2006-08-04 08:07:31 UTC (rev 1687) +++ crux-2.2/ports/opt/xxdiff/.footprint 2006-08-04 14:47:34 UTC (rev 1688) @@ -1,4 +1,3 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/xxdiff --rwxr-xr-x root/root usr/bin/xxdiff-cvs-diff Modified: crux-2.2/ports/opt/xxdiff/.md5sum =================================================================== --- crux-2.2/ports/opt/xxdiff/.md5sum 2006-08-04 08:07:31 UTC (rev 1687) +++ crux-2.2/ports/opt/xxdiff/.md5sum 2006-08-04 14:47:34 UTC (rev 1688) @@ -1,4 +1,2 @@ -9008dcb04592b4fb8e85e6bd1dcd3b0a tmake-1.8.tar.gz -ead4e429e8a084eda46ecbf4d47d4512 xxdiff-3.1.tar.gz -2bd3f8443b47e213e6c252506d6cf03a xxdiff-cvs-fix.diff -fa55e55e4d155a87b5d2a5be39606e32 xxdiff-nostyleforce.diff +301ff399a1e4be8b68c38c3e27c0b1ad xxdiff-3.2.tar.bz2 +8bf72bb5fa9013e5b35ae2ee494c8f2c xxdiff-nostyleforce.diff Modified: crux-2.2/ports/opt/xxdiff/Pkgfile =================================================================== --- crux-2.2/ports/opt/xxdiff/Pkgfile 2006-08-04 08:07:31 UTC (rev 1687) +++ crux-2.2/ports/opt/xxdiff/Pkgfile 2006-08-04 14:47:34 UTC (rev 1688) @@ -5,23 +5,19 @@ # Depends: qt3 name=xxdiff -version=3.1 +version=3.2 release=1 -source=(http://dl.sourceforge.net/sourceforge/${name}/${name}-${version}.tar.gz\ - ftp://ftp.trolltech.com/freebies/tmake/tmake-1.8.tar.gz \ - xxdiff-nostyleforce.diff - xxdiff-cvs-fix.diff) +source=(http://dl.sf.net/sourceforge/${name}/${name}-${version}.tar.bz2 + xxdiff-nostyleforce.diff) + build() { - export TMAKEPATH=$SRC/tmake-1.8/lib/linux-g++ export QTDIR=${QTDIR:=/usr/share/qt} cd $name-$version/src - patch -p2 < ../../xxdiff-nostyleforce.diff - patch ../bin/xxdiff-cvs-diff $SRC/xxdiff-cvs-fix.diff + patch -p2 < $SRC/xxdiff-nostyleforce.diff - $SRC/tmake-1.8/bin/tmake xxdiff.pro > Makefile + make -f Makefile.bootstrap makefile make - install -m 755 -d $PKG/usr/bin - install -m 755 ../bin/xxdiff{,-cvs-diff} $PKG/usr/bin + install -m 755 -D ../bin/xxdiff $PKG/usr/bin/xxdiff } Deleted: crux-2.2/ports/opt/xxdiff/xxdiff-cvs-fix.diff =================================================================== --- crux-2.2/ports/opt/xxdiff/xxdiff-cvs-fix.diff 2006-08-04 08:07:31 UTC (rev 1687) +++ crux-2.2/ports/opt/xxdiff/xxdiff-cvs-fix.diff 2006-08-04 14:47:34 UTC (rev 1688) @@ -1,11 +0,0 @@ ---- xxdiff-cvs-diff.old 2004-10-29 10:40:21.000000000 +0200 -+++ xxdiff-cvs-diff 2004-10-29 21:32:00.103934168 +0200 -@@ -115,7 +115,7 @@ - # a temporary file. - tmpf = NamedTemporaryFile(prefix=tmppfx) - cin, cout = os.popen2( -- 'patch --reverse --output "%s"' % tmpf.name, 'rw') -+ 'patch -p0 --reverse --output "%s"' % tmpf.name, 'rw') - cin.write('Index: %s\n' % filename) - cin.write(patch) - cin.close() Modified: crux-2.2/ports/opt/xxdiff/xxdiff-nostyleforce.diff =================================================================== --- crux-2.2/ports/opt/xxdiff/xxdiff-nostyleforce.diff 2006-08-04 08:07:31 UTC (rev 1687) +++ crux-2.2/ports/opt/xxdiff/xxdiff-nostyleforce.diff 2006-08-04 14:47:34 UTC (rev 1688) @@ -1,6 +1,6 @@ ---- xxdiff-3.0.2/src/app.cpp.orig 2004-10-28 10:41:20.782609600 +0200 -+++ xxdiff-3.0.2/src/app.cpp 2004-10-28 10:42:00.925506952 +0200 -@@ -261,22 +261,6 @@ +--- xxdiff-3.2/src/app.cpp.orig 2006-08-04 16:40:25.144936920 +0200 ++++ xxdiff-3.2/src/app.cpp 2006-08-04 16:40:46.151743400 +0200 +@@ -265,22 +265,6 @@ // Read in the resources and create resources object. _resources = buildResources(); @@ -20,6 +20,6 @@ - } -#endif - - // Read in the file names. - QString filenames[3]; - QString displayFilenames[3]; + if ( _cmdline._promptForFiles ) { + promptForFiles( _cmdline ); + }

1 0

r1687 - crux-2.2/ports/core/readline
by crux＠crux.nu 04 Aug '06

04 Aug '06

Author: jw Date: 2006-08-04 10:07:31 +0200 (Fri, 04 Aug 2006) New Revision: 1687 Removed: crux-2.2/ports/core/readline/readline-5.1-001.patch Log: readline: remove patch from port Deleted: crux-2.2/ports/core/readline/readline-5.1-001.patch =================================================================== --- crux-2.2/ports/core/readline/readline-5.1-001.patch 2006-08-04 08:07:10 UTC (rev 1686) +++ crux-2.2/ports/core/readline/readline-5.1-001.patch 2006-08-04 08:07:31 UTC (rev 1687) @@ -1,77 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.1 -Patch-ID: readline51-001 - -Bug-Reported-by: Andreas Schwab <schwab(a)suse.de> -Bug-Reference-ID: <20051213141916.4014A394BFABD(a)sykes.suse.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00038.html - -Bug-Description: - -A problem with the readline callback interface can result in segmentation -faults when using the delete-char function via a multiple-key sequence. -Two consecutive calls to delete-char will crash the application calling -readline. - -Patch: - -*** ../readline-5.1/readline.c Mon Jul 4 22:29:35 2005 ---- readline.c Tue Dec 20 17:38:29 2005 -*************** -*** 715,719 **** - rl_dispatching = 1; - RL_SETSTATE(RL_STATE_DISPATCHING); -! r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); - RL_UNSETSTATE(RL_STATE_DISPATCHING); - rl_dispatching = 0; ---- 715,719 ---- - rl_dispatching = 1; - RL_SETSTATE(RL_STATE_DISPATCHING); -! (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); - RL_UNSETSTATE(RL_STATE_DISPATCHING); - rl_dispatching = 0; -*** ../readline-5.1/text.c Sat Sep 24 19:06:07 2005 ---- text.c Tue Dec 20 17:38:26 2005 -*************** -*** 1072,1077 **** - int count, key; - { -- int r; -- - if (count < 0) - return (_rl_rubout_char (-count, key)); ---- 1072,1075 ---- -*************** -*** 1091,1097 **** - rl_forward_byte (count, key); - -! r = rl_kill_text (orig_point, rl_point); - rl_point = orig_point; -- return r; - } - else ---- 1089,1094 ---- - rl_forward_byte (count, key); - -! rl_kill_text (orig_point, rl_point); - rl_point = orig_point; - } - else -*************** -*** 1100,1105 **** - - new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO); -! return (rl_delete_text (rl_point, new_point)); - } - } - ---- 1097,1103 ---- - - new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO); -! rl_delete_text (rl_point, new_point); - } -+ return 0; - } -

1 0

r1686 - crux-2.2/ports/core/readline
by crux＠crux.nu 04 Aug '06

04 Aug '06

Author: jw Date: 2006-08-04 10:07:10 +0200 (Fri, 04 Aug 2006) New Revision: 1686 Modified: crux-2.2/ports/core/readline/.md5sum crux-2.2/ports/core/readline/Pkgfile Log: readline: update to patchlevel 4 (if you read this, please comment whether this change contains too much bashish :-)) Modified: crux-2.2/ports/core/readline/.md5sum =================================================================== --- crux-2.2/ports/core/readline/.md5sum 2006-08-04 07:44:42 UTC (rev 1685) +++ crux-2.2/ports/core/readline/.md5sum 2006-08-04 08:07:10 UTC (rev 1686) @@ -1,3 +1,6 @@ 553cf04fdeec54dca12062864c3ffba3 inputrc -63faf622820ca0828131c8b5aeac1e6a readline-5.1-001.patch 7ee5a692db88b30ca48927a13fd60e46 readline-5.1.tar.gz +63faf622820ca0828131c8b5aeac1e6a readline51-001 +e60f96f9277f42aa2e66020b2f30e55f readline51-002 +c9c488f203dbfa1a7da843a07c6c2a25 readline51-003 +1b5e14a35a781dfce8ae23389cff30c0 readline51-004 Modified: crux-2.2/ports/core/readline/Pkgfile =================================================================== --- crux-2.2/ports/core/readline/Pkgfile 2006-08-04 07:44:42 UTC (rev 1685) +++ crux-2.2/ports/core/readline/Pkgfile 2006-08-04 08:07:10 UTC (rev 1686) @@ -4,13 +4,17 @@ name=readline version=5.1 -release=2 +release=3 source=(http://mirrors.sunsite.dk/gnu/$name/$name-$version.tar.gz \ - $name-$version-001.patch inputrc) + http://ftp.gnu.org/gnu/readline/readline-5.1-patches/readline51-00{1..4} + inputrc) build() { cd $name-$version - patch -p0 < ../$name-$version-001.patch + + for p in {1..4}; do + patch -p0 < $SRC/readline51-00$p + done ./configure --prefix=/usr make make DESTDIR=$PKG install

1 0

r1685 - crux-2.2/ports/core/shadow
by crux＠crux.nu 04 Aug '06

04 Aug '06

Author: jw Date: 2006-08-04 09:44:42 +0200 (Fri, 04 Aug 2006) New Revision: 1685 Added: crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd-usermod.diff Removed: crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd.diff Modified: crux-2.2/ports/core/shadow/.md5sum crux-2.2/ports/core/shadow/Pkgfile Log: shadow: usermod was also affected Modified: crux-2.2/ports/core/shadow/.md5sum =================================================================== --- crux-2.2/ports/core/shadow/.md5sum 2006-08-04 07:37:48 UTC (rev 1684) +++ crux-2.2/ports/core/shadow/.md5sum 2006-08-04 07:44:42 UTC (rev 1685) @@ -1,7 +1,7 @@ 2b8c303d972cf6fb2a4545dd17262f27 login.defs be8f69c2701118093af3d7f3bc02af16 pwck 9e2f566e29068dc98e42ea94ac788200 shadow-4.0.15-nflg-conflict.diff -01113c9a0b7100ffb3b0538635b8f2f3 shadow-4.0.18.1-useradd.diff +aa1259020b925cd3088cb7a36fbe7753 shadow-4.0.18.1-useradd-usermod.diff e7751d46ecf219c07ae0b028ab3335c6 shadow-4.0.18.1.tar.bz2 a588e277ff49988f0e3787c5b327d10c shadow-fix-useradd-usergroups.patch 75161be083592e2e4e7f9cdcb7369bab useradd-usergroup.diff Modified: crux-2.2/ports/core/shadow/Pkgfile =================================================================== --- crux-2.2/ports/core/shadow/Pkgfile 2006-08-04 07:37:48 UTC (rev 1684) +++ crux-2.2/ports/core/shadow/Pkgfile 2006-08-04 07:44:42 UTC (rev 1685) @@ -5,21 +5,22 @@ name=shadow version=4.0.18.1 -release=2 +release=3 source=(ftp://ftp.pld.org.pl/software/shadow/$name-$version.tar.bz2 pwck login.defs shadow-fix-useradd-usergroups.patch shadow-4.0.15-nflg-conflict.diff - useradd-usergroup.diff - shadow-4.0.18.1-useradd.diff) + useradd-usergroup.diff + shadow-4.0.18.1-useradd-usermod.diff) build() { cd $name-$version patch src/useradd.c $SRC/shadow-fix-useradd-usergroups.patch patch src/useradd.c $SRC/shadow-4.0.15-nflg-conflict.diff patch src/useradd.c $SRC/useradd-usergroup.diff - patch src/useradd.c $SRC/shadow-4.0.18.1-useradd.diff + patch -p1 < $SRC/shadow-4.0.18.1-useradd-usermod.diff + ./configure --prefix=/usr \ --mandir=/usr/man \ --sysconfdir=/etc \ Added: crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd-usermod.diff =================================================================== --- crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd-usermod.diff (rev 0) +++ crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd-usermod.diff 2006-08-04 07:44:42 UTC (rev 1685) @@ -0,0 +1,42 @@ +--- shadow-4.0.18.1.orig/src/useradd.c 2006-07-28 19:42:48.000000000 +0200 ++++ shadow-4.0.18.1/src/useradd.c 2006-08-04 09:24:34.000000000 +0200 +@@ -203,13 +203,17 @@ + long gid; + char *errptr; + ++ struct group* grp = getgrnam (grname); ++ if (grp) ++ return grp; ++ + gid = strtol (grname, &errptr, 10); + if (*errptr || errno == ERANGE || gid < 0) { + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), Prog, grname); + exit (E_BAD_ARG); + } +- return getgrnam (grname); ++ return getgrgid (gid); + } + + static long get_number (const char *numstr) +--- shadow-4.0.18.1.orig/src/usermod.c 2006-07-28 19:42:48.000000000 +0200 ++++ shadow-4.0.18.1/src/usermod.c 2006-08-04 09:24:21.000000000 +0200 +@@ -165,13 +165,17 @@ + long val; + char *errptr; + ++ struct group* grp = getgrnam (grname); ++ if (grp) ++ return grp; ++ + val = strtol (grname, &errptr, 10); + if (*errptr || errno == ERANGE || val < 0) { + fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog, + grname); + exit (E_BAD_ARG); + } +- return getgrnam (grname); ++ return getgrgid (val); + } + + /* Deleted: crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd.diff =================================================================== --- crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd.diff 2006-08-04 07:37:48 UTC (rev 1684) +++ crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd.diff 2006-08-04 07:44:42 UTC (rev 1685) @@ -1,21 +0,0 @@ ---- shadow-4.0.18.1/src/useradd.c.orig 2006-08-04 08:22:46.000000000 +0200 -+++ shadow-4.0.18.1/src/useradd.c 2006-08-04 08:39:49.000000000 +0200 -@@ -203,13 +203,17 @@ - long gid; - char *errptr; - -+ struct group* grp = getgrnam(grname); -+ if (grp) -+ return grp; -+ - gid = strtol (grname, &errptr, 10); - if (*errptr || errno == ERANGE || gid < 0) { - fprintf (stderr, - _("%s: invalid numeric argument '%s'\n"), Prog, grname); - exit (E_BAD_ARG); - } -- return getgrnam (grname); -+ return getgrgid(gid); - } - - static long get_number (const char *numstr)

1 0

r1684 - crux-2.2/ports/opt/acroread
by crux＠crux.nu 04 Aug '06

04 Aug '06

Author: sip Date: 2006-08-04 09:37:48 +0200 (Fri, 04 Aug 2006) New Revision: 1684 Added: crux-2.2/ports/opt/acroread/acroread-expr.patch Modified: crux-2.2/ports/opt/acroread/.md5sum crux-2.2/ports/opt/acroread/Pkgfile Log: acroread: added patch for new coreutils, thanks to Simon Glossner Modified: crux-2.2/ports/opt/acroread/.md5sum =================================================================== --- crux-2.2/ports/opt/acroread/.md5sum 2006-08-04 07:16:49 UTC (rev 1683) +++ crux-2.2/ports/opt/acroread/.md5sum 2006-08-04 07:37:48 UTC (rev 1684) @@ -1 +1,2 @@ 4834f13ee45c7b1be263fb89aa49d212 AdobeReader_enu-7.0.8-1.i386.tar.gz +0e1641bd90c5721284c691944c2b7ba0 acroread-expr.patch Modified: crux-2.2/ports/opt/acroread/Pkgfile =================================================================== --- crux-2.2/ports/opt/acroread/Pkgfile 2006-08-04 07:16:49 UTC (rev 1683) +++ crux-2.2/ports/opt/acroread/Pkgfile 2006-08-04 07:37:48 UTC (rev 1684) @@ -6,8 +6,9 @@ name=acroread version=7.0.8 -release=1 -source=(http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.8/enu/AdobeReader_enu-7.0.8-1.i386.tar.gz) +release=2 +source=(http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.8/enu/AdobeReader_enu-7.0.8-1.i386.tar.gz \ + $name-expr.patch) PKGMK_NO_STRIP="yes" build() { @@ -22,4 +23,7 @@ sed -i 's|REPLACE_ME|/usr/lib/Acrobat7/Reader|g' bin/acroread ln -sf /usr/lib/Acrobat7/bin/acroread $PKG/usr/bin/acroread find . -type d | xargs chmod 755 + + cd $PKG/usr/lib/Acrobat7/bin + patch < $SRC/$name-expr.patch } Added: crux-2.2/ports/opt/acroread/acroread-expr.patch =================================================================== --- crux-2.2/ports/opt/acroread/acroread-expr.patch (rev 0) +++ crux-2.2/ports/opt/acroread/acroread-expr.patch 2006-08-04 07:37:48 UTC (rev 1684) @@ -0,0 +1,21 @@ +--- acroread.orig 2006-08-04 01:45:40.000000000 +0200 ++++ acroread 2006-08-04 01:47:39.000000000 +0200 +@@ -455,13 +455,13 @@ + continue + fi + +- len_version=`expr length $version` +- base_version=`expr substr "${base_version}0000000000" 1 $len_version` +- len_base_version=`expr length $base_version` ++ len_version=`expr length "$version"` ++ base_version=`expr substr "${base_version}0000000000" 1 "$len_version"` ++ len_base_version=`expr length "$base_version"` + + while [ $len_version -gt $len_base_version ]; do +- base_version=`expr substr "${base_version}0000000000" 1 $len_version` +- len_base_version=`expr length $base_version` ++ base_version=`expr substr "${base_version}0000000000" 1 "$len_version"` ++ len_base_version=`expr length "$base_version"` + done + + if [ $version -ge $base_version ]; then

1 0

r1683 - crux-2.2/ports/core/shadow
by crux＠crux.nu 04 Aug '06

04 Aug '06

Author: jw Date: 2006-08-04 09:16:49 +0200 (Fri, 04 Aug 2006) New Revision: 1683 Added: crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd.diff Log: shadow: add the patch :-) Added: crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd.diff =================================================================== --- crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd.diff (rev 0) +++ crux-2.2/ports/core/shadow/shadow-4.0.18.1-useradd.diff 2006-08-04 07:16:49 UTC (rev 1683) @@ -0,0 +1,21 @@ +--- shadow-4.0.18.1/src/useradd.c.orig 2006-08-04 08:22:46.000000000 +0200 ++++ shadow-4.0.18.1/src/useradd.c 2006-08-04 08:39:49.000000000 +0200 +@@ -203,13 +203,17 @@ + long gid; + char *errptr; + ++ struct group* grp = getgrnam(grname); ++ if (grp) ++ return grp; ++ + gid = strtol (grname, &errptr, 10); + if (*errptr || errno == ERANGE || gid < 0) { + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), Prog, grname); + exit (E_BAD_ARG); + } +- return getgrnam (grname); ++ return getgrgid(gid); + } + + static long get_number (const char *numstr)

1 0

r1682 - crux-2.2/ports/core/shadow
by crux＠crux.nu 04 Aug '06

04 Aug '06

Author: jw Date: 2006-08-04 08:50:56 +0200 (Fri, 04 Aug 2006) New Revision: 1682 Modified: crux-2.2/ports/core/shadow/.md5sum crux-2.2/ports/core/shadow/Pkgfile Log: shadow: fix useradd regression from 4.0.18 Modified: crux-2.2/ports/core/shadow/.md5sum =================================================================== --- crux-2.2/ports/core/shadow/.md5sum 2006-08-03 21:19:53 UTC (rev 1681) +++ crux-2.2/ports/core/shadow/.md5sum 2006-08-04 06:50:56 UTC (rev 1682) @@ -1,6 +1,7 @@ 2b8c303d972cf6fb2a4545dd17262f27 login.defs be8f69c2701118093af3d7f3bc02af16 pwck 9e2f566e29068dc98e42ea94ac788200 shadow-4.0.15-nflg-conflict.diff +01113c9a0b7100ffb3b0538635b8f2f3 shadow-4.0.18.1-useradd.diff e7751d46ecf219c07ae0b028ab3335c6 shadow-4.0.18.1.tar.bz2 a588e277ff49988f0e3787c5b327d10c shadow-fix-useradd-usergroups.patch 75161be083592e2e4e7f9cdcb7369bab useradd-usergroup.diff Modified: crux-2.2/ports/core/shadow/Pkgfile =================================================================== --- crux-2.2/ports/core/shadow/Pkgfile 2006-08-03 21:19:53 UTC (rev 1681) +++ crux-2.2/ports/core/shadow/Pkgfile 2006-08-04 06:50:56 UTC (rev 1682) @@ -5,18 +5,20 @@ name=shadow version=4.0.18.1 -release=1 -source=(ftp://ftp.pld.org.pl/software/shadow/$name-$version.tar.bz2 \ - pwck login.defs \ - shadow-fix-useradd-usergroups.patch\ - shadow-4.0.15-nflg-conflict.diff \ - useradd-usergroup.diff) +release=2 +source=(ftp://ftp.pld.org.pl/software/shadow/$name-$version.tar.bz2 + pwck login.defs + shadow-fix-useradd-usergroups.patch + shadow-4.0.15-nflg-conflict.diff + useradd-usergroup.diff + shadow-4.0.18.1-useradd.diff) build() { cd $name-$version patch src/useradd.c $SRC/shadow-fix-useradd-usergroups.patch patch src/useradd.c $SRC/shadow-4.0.15-nflg-conflict.diff patch src/useradd.c $SRC/useradd-usergroup.diff + patch src/useradd.c $SRC/shadow-4.0.18.1-useradd.diff ./configure --prefix=/usr \ --mandir=/usr/man \

1 0