March 2008 - crux-commits

ports/opt (2.4): nss: Don't symlink nspr/nss.pc to mozilla-nspr/nss.pc, conflicts with other mozilla products.
by crux＠crux.nu 17 Mar '08

17 Mar '08

commit bd8f0c002ed0b548b5a1831c832ba2607158ef6a Author: Brett Goulder <predatorfreak(a)dcaf-security.org> Date: Mon Mar 17 01:12:55 2008 -0400 nss: Don't symlink nspr/nss.pc to mozilla-nspr/nss.pc, conflicts with other mozilla products. diff --git a/nss/.footprint b/nss/.footprint index 468e109..331b7fc 100644 --- a/nss/.footprint +++ b/nss/.footprint @@ -179,7 +179,5 @@ lrwxrwxrwx root/root usr/lib/libplds4.so -> libplds4.so.7 -rw-r--r-- root/root usr/lib/libsoftokn3.so -rw-r--r-- root/root usr/lib/libssl3.so drwxr-xr-x root/root usr/lib/pkgconfig/ -lrwxrwxrwx root/root usr/lib/pkgconfig/mozilla-nspr.pc -> nspr.pc -lrwxrwxrwx root/root usr/lib/pkgconfig/mozilla-nss.pc -> nss.pc -rw-r--r-- root/root usr/lib/pkgconfig/nspr.pc -rw-r--r-- root/root usr/lib/pkgconfig/nss.pc diff --git a/nss/Pkgfile b/nss/Pkgfile index 86e81a8..98fd709 100644 --- a/nss/Pkgfile +++ b/nss/Pkgfile @@ -59,7 +59,6 @@ build() { $PKG/usr/lib/pkgconfig/nspr.pc pushd $PKG/usr/lib/pkgconfig - ln -s nspr.pc mozilla-nspr.pc popd install -D -m 0755 config/nspr-config $PKG/usr/bin/nspr-config @@ -83,7 +82,6 @@ build() { -e "s,@NSS_VERSION@,$version,g" > \ $PKG/usr/lib/pkgconfig/nss.pc - ln -sf nss.pc $PKG/usr/lib/pkgconfig/mozilla-nss.pc chmod 0644 $PKG/usr/lib/pkgconfig/*.pc sed $SRC/nss-config.in \

1 0

ports/opt (2.4): grub: Add a patch to fix a problem with ext2/ext3 filesystems (thanks to Paul Ignatenko for encountering this and tracking it down).
by crux＠crux.nu 17 Mar '08

17 Mar '08

commit f2e04bc5b046b322aa16c972884b8b488d650e03 Author: Brett Goulder <predatorfreak(a)dcaf-security.org> Date: Sun Mar 16 20:05:49 2008 -0400 grub: Add a patch to fix a problem with ext2/ext3 filesystems (thanks to Paul Ignatenko for encountering this and tracking it down). diff --git a/grub/.md5sum b/grub/.md5sum index 2d994f6..f06ae66 100644 --- a/grub/.md5sum +++ b/grub/.md5sum @@ -2,4 +2,5 @@ 55e343038043e16df5293d63782373d0 crux03.xpm.gz e0fce491c713805650df3d8962ead526 grub-0.97-patches.tar.gz cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz +ada26cbc681907823cc4ff2a55b97866 grub-ext2-ext3-inodesize.patch 1f2733522ab27183e3830d93733141ac grub.conf.sample diff --git a/grub/Pkgfile b/grub/Pkgfile index dcf21bd..0de3229 100644 --- a/grub/Pkgfile +++ b/grub/Pkgfile @@ -11,6 +11,7 @@ source=(ftp://alpha.gnu.org/gnu/grub/$name-$version.tar.gz \ http://crux.nu/files/grub/$version/$name-$version-patches.tar.gz \ http://crux.nu/files/grub/common/crux02.xpm.gz \ http://crux.nu/files/grub/common/crux03.xpm.gz \ + grub-ext2-ext3-inodesize.patch \ grub.conf.sample) build () { @@ -68,6 +69,8 @@ build () { # http://lists.gnu.org/archive/html/bug-grub/2005-04/msg00031.html patch -p0 -i $SRC/$name-patches/$name-0.95-xfs-writable-strings.patch + # Fix a problem with ext2/ext3 filesystems that have a certain inode size. + patch -p1 -i $SRC/grub-ext2-ext3-inodesize.patch unset CXXFLAGS export CFLAGS="-Os" diff --git a/grub/grub-ext2-ext3-inodesize.patch b/grub/grub-ext2-ext3-inodesize.patch new file mode 100644 index 0000000..bef3bc1 --- /dev/null +++ b/grub/grub-ext2-ext3-inodesize.patch @@ -0,0 +1,94 @@ +diff -Nrup a/stage2/fsys_ext2fs.c b/stage2/fsys_ext2fs.c +--- a/stage2/fsys_ext2fs.c 2004-08-08 20:19:18.000000000 +0200 ++++ b/stage2/fsys_ext2fs.c 2008-01-30 14:27:20.000000000 +0100 +@@ -79,7 +79,52 @@ struct ext2_super_block + __u32 s_rev_level; /* Revision level */ + __u16 s_def_resuid; /* Default uid for reserved blocks */ + __u16 s_def_resgid; /* Default gid for reserved blocks */ +- __u32 s_reserved[235]; /* Padding to the end of the block */ ++ /* ++ * These fields are for EXT2_DYNAMIC_REV superblocks only. ++ * ++ * Note: the difference between the compatible feature set and ++ * the incompatible feature set is that if there is a bit set ++ * in the incompatible feature set that the kernel doesn't ++ * know about, it should refuse to mount the filesystem. ++ * ++ * e2fsck's requirements are more strict; if it doesn't know ++ * about a feature in either the compatible or incompatible ++ * feature set, it must abort and not try to meddle with ++ * things it doesn't understand... ++ */ ++ __u32 s_first_ino; /* First non-reserved inode */ ++ __u16 s_inode_size; /* size of inode structure */ ++ __u16 s_block_group_nr; /* block group # of this superblock */ ++ __u32 s_feature_compat; /* compatible feature set */ ++ __u32 s_feature_incompat; /* incompatible feature set */ ++ __u32 s_feature_ro_compat; /* readonly-compatible feature set */ ++ __u8 s_uuid[16]; /* 128-bit uuid for volume */ ++ char s_volume_name[16]; /* volume name */ ++ char s_last_mounted[64]; /* directory where last mounted */ ++ __u32 s_algorithm_usage_bitmap; /* For compression */ ++ /* ++ * Performance hints. Directory preallocation should only ++ * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on. ++ */ ++ __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ ++ __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ ++ __u16 s_reserved_gdt_blocks;/* Per group table for online growth */ ++ /* ++ * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set. ++ */ ++ __u8 s_journal_uuid[16]; /* uuid of journal superblock */ ++ __u32 s_journal_inum; /* inode number of journal file */ ++ __u32 s_journal_dev; /* device number of journal file */ ++ __u32 s_last_orphan; /* start of list of inodes to delete */ ++ __u32 s_hash_seed[4]; /* HTREE hash seed */ ++ __u8 s_def_hash_version; /* Default hash version to use */ ++ __u8 s_jnl_backup_type; /* Default type of journal backup */ ++ __u16 s_reserved_word_pad; ++ __u32 s_default_mount_opts; ++ __u32 s_first_meta_bg; /* First metablock group */ ++ __u32 s_mkfs_time; /* When the filesystem was created */ ++ __u32 s_jnl_blocks[17]; /* Backup of the journal inode */ ++ __u32 s_reserved[172]; /* Padding to the end of the block */ + }; + + struct ext2_group_desc +@@ -218,6 +263,9 @@ struct ext2_dir_entry + #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) + #define EXT2_ADDR_PER_BLOCK_BITS(s) (log2(EXT2_ADDR_PER_BLOCK(s))) + ++#define EXT2_INODE_SIZE(s) (SUPERBLOCK->s_inode_size) ++#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s)) ++ + /* linux/ext2_fs.h */ + #define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) + /* kind of from ext2/super.c */ +@@ -553,7 +601,7 @@ ext2fs_dir (char *dirname) + gdp = GROUP_DESC; + ino_blk = gdp[desc].bg_inode_table + + (((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group)) +- >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode))); ++ >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); + #ifdef E2DEBUG + printf ("inode table fsblock=%d\n", ino_blk); + #endif /* E2DEBUG */ +@@ -565,13 +613,12 @@ ext2fs_dir (char *dirname) + /* reset indirect blocks! */ + mapblock2 = mapblock1 = -1; + +- raw_inode = INODE + +- ((current_ino - 1) +- & (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode) - 1)); ++ raw_inode = (struct ext2_inode *)((char *)INODE + ++ ((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1)) * ++ EXT2_INODE_SIZE (SUPERBLOCK)); + #ifdef E2DEBUG + printf ("ipb=%d, sizeof(inode)=%d\n", +- (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)), +- sizeof (struct ext2_inode)); ++ EXT2_INODES_PER_BLOCK (SUPERBLOCK), EXT2_INODE_SIZE (SUPERBLOCK)); + printf ("inode=%x, raw_inode=%x\n", INODE, raw_inode); + printf ("offset into inode table block=%d\n", (int) raw_inode - (int) INODE); + for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode;

1 0

ports/xorg (2.4): xorg-xproto: updated to 7.0.12.
by crux＠crux.nu 16 Mar '08

16 Mar '08

commit 4fcf3d67a3c678218b7a15885775433b39da3d60 Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Sun Mar 16 18:22:15 2008 +0100 xorg-xproto: updated to 7.0.12. diff --git a/xorg-xproto/.md5sum b/xorg-xproto/.md5sum index 291c4c2..0f832e8 100644 --- a/xorg-xproto/.md5sum +++ b/xorg-xproto/.md5sum @@ -1 +1 @@ -6b6c266576d81c505aa4a1828151f7f8 xproto-7.0.11.tar.bz2 +388234421add6c1760b4fc99fcdc76b0 xproto-7.0.12.tar.bz2 diff --git a/xorg-xproto/Pkgfile b/xorg-xproto/Pkgfile index d3063cd..56b0e27 100644 --- a/xorg-xproto/Pkgfile +++ b/xorg-xproto/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Tilman Sauerbeck, tilman at crux dot nu name=xorg-xproto -version=7.0.11 +version=7.0.12 release=1 source=(http://xorg.freedesktop.org/releases/individual/proto/xproto-$versi…

1 0

ports/opt (2.4): uw-imap: update to 2007a1
by crux＠crux.nu 16 Mar '08

16 Mar '08

commit ecea33e8e3816c942d6a0fbf0fe0ec9be10b748e Author: Juergen Daubert <jue(a)jue.li> Date: Sun Mar 16 11:22:18 2008 +0100 uw-imap: update to 2007a1 diff --git a/uw-imap/.md5sum b/uw-imap/.md5sum index 7c4797a..17086f4 100644 --- a/uw-imap/.md5sum +++ b/uw-imap/.md5sum @@ -1 +1 @@ -7e67c974973bfff77c7766756a92a70b imap-2007a.tar.Z +828a84c64ef933bfcc805b838576a774 imap-2007a1.tar.Z diff --git a/uw-imap/Pkgfile b/uw-imap/Pkgfile index e8e1098..0a11385 100644 --- a/uw-imap/Pkgfile +++ b/uw-imap/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl name=uw-imap -version=2007a +version=2007a1 release=1 source=(ftp://ftp.cac.washington.edu/imap/imap-$version.tar.Z)

1 0

ports/opt (2.4): libc-client: update to 2007a1
by crux＠crux.nu 16 Mar '08

16 Mar '08

commit 9269106f3e16b6e332aeada5f9d850ab10fe413f Author: Juergen Daubert <jue(a)jue.li> Date: Sun Mar 16 11:23:29 2008 +0100 libc-client: update to 2007a1 diff --git a/libc-client/.md5sum b/libc-client/.md5sum index 7c4797a..17086f4 100644 --- a/libc-client/.md5sum +++ b/libc-client/.md5sum @@ -1 +1 @@ -7e67c974973bfff77c7766756a92a70b imap-2007a.tar.Z +828a84c64ef933bfcc805b838576a774 imap-2007a1.tar.Z diff --git a/libc-client/Pkgfile b/libc-client/Pkgfile index 080f991..2fef175 100644 --- a/libc-client/Pkgfile +++ b/libc-client/Pkgfile @@ -4,12 +4,12 @@ # Depends on: openssl name=libc-client -version=2007a +version=2007a1 release=1 source=(ftp://ftp.cac.washington.edu/imap/imap-$version.tar.Z) build () { - cd imap-$version + cd imap-${version::5} sed -i 's/read x/x=y/' Makefile echo y | make slx EXTRACFLAGS="$CFLAGS" \ SSLTYPE=unix \

1 0

ports/core (2.4): findutils: updated to 4.4.0.
by crux＠crux.nu 16 Mar '08

16 Mar '08

commit 2f157063d4ff63e04b9f54026dbaa4a17ff6dbe3 Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Sun Mar 16 10:51:43 2008 +0100 findutils: updated to 4.4.0. diff --git a/findutils/.footprint b/findutils/.footprint index b82ac56..9635d06 100644 --- a/findutils/.footprint +++ b/findutils/.footprint @@ -1,6 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/find +-rwxr-xr-x root/root usr/bin/oldfind -rwxr-xr-x root/root usr/bin/xargs drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ diff --git a/findutils/.md5sum b/findutils/.md5sum index 148d326..de1b0b5 100644 --- a/findutils/.md5sum +++ b/findutils/.md5sum @@ -1 +1 @@ -b7e35aa175778c84942b1fee4144988b findutils-4.2.33.tar.gz +49e769ac4382fae6f104f99d54d0a112 findutils-4.4.0.tar.gz diff --git a/findutils/Pkgfile b/findutils/Pkgfile index c7e2dcc..1def895 100644 --- a/findutils/Pkgfile +++ b/findutils/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=findutils -version=4.2.33 +version=4.4.0 release=1 source=(http://ftp.gnu.org/pub/gnu/$name/$name-$version.tar.gz)

1 0

ports/core (2.4): dhcpcd: update to 3.2.3
by crux＠crux.nu 16 Mar '08

16 Mar '08

commit c1014c0bd56ccf7d71b932802bd43a3ab849a35c Author: Juergen Daubert <jue(a)jue.li> Date: Sun Mar 16 10:41:56 2008 +0100 dhcpcd: update to 3.2.3 diff --git a/dhcpcd/.md5sum b/dhcpcd/.md5sum index e8388f5..16e9436 100644 --- a/dhcpcd/.md5sum +++ b/dhcpcd/.md5sum @@ -1 +1 @@ -03b139d5e9527b7a830a222fb55db1e1 dhcpcd-3.1.9.tar.bz2 +f7b0b302307e27e00412d81c22df28b3 dhcpcd-3.2.3.tar.bz2 diff --git a/dhcpcd/Pkgfile b/dhcpcd/Pkgfile index 9b593e6..3f4af10 100644 --- a/dhcpcd/Pkgfile +++ b/dhcpcd/Pkgfile @@ -3,12 +3,12 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=dhcpcd -version=3.1.9 +version=3.2.3 release=1 source=(http://roy.marples.name/dhcpcd/$name-$version.tar.bz2) build () { cd $name-$version - make + make CSTD=gnu99 make DESTDIR=$PKG MANPREFIX=/usr install }

1 0

ports/core (2.4): nfs-utils: update to 1.1.2
by crux＠crux.nu 16 Mar '08

16 Mar '08

commit 0267a6f7ea43647f6e6a69fa2a54724dd5e88ea2 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Mar 16 10:41:05 2008 +0100 nfs-utils: update to 1.1.2 diff --git a/nfs-utils/.md5sum b/nfs-utils/.md5sum index 788b3f8..e5f986a 100644 --- a/nfs-utils/.md5sum +++ b/nfs-utils/.md5sum @@ -1,4 +1,4 @@ c5ccf58f5f9f57aba75c8b72219eb6e6 exports f75dd45017a56ab4ecb6e87ef40aba78 nfs -407785488241f9db67b1874e3f36370e nfs-utils-1.1.1.tar.gz +76ee9274c2b867839427eba91b327f03 nfs-utils-1.1.2.tar.gz 7222d95af7b1313985505d1494927ae5 nfsserver diff --git a/nfs-utils/Pkgfile b/nfs-utils/Pkgfile index 29b6f1b..0b16900 100644 --- a/nfs-utils/Pkgfile +++ b/nfs-utils/Pkgfile @@ -3,8 +3,8 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=nfs-utils -version=1.1.1 -release=2 +version=1.1.2 +release=1 source=(http://dl.sourceforge.net/nfs/$name-$version.tar.gz \ exports nfs nfsserver)

1 0

ports/opt (2.4): ruby-gtk: added a patch to fix the build with glib 2.16.
by crux＠crux.nu 15 Mar '08

15 Mar '08

commit 7e4db7bba9c4abd3da53c9e34cc4ba4a3c09bf43 Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Sat Mar 15 17:34:32 2008 +0100 ruby-gtk: added a patch to fix the build with glib 2.16. diff --git a/ruby-gtk/.md5sum b/ruby-gtk/.md5sum index 275e329..e4ce9b4 100644 --- a/ruby-gtk/.md5sum +++ b/ruby-gtk/.md5sum @@ -1,2 +1,2 @@ -e3aaae7cf5d1589dcf94d7f2bd4334d3 ruby-gtk.diff +1aac72ec246354641bfc6a19aaf2fb1f ruby-gtk.diff aedca2b3a7c6ae0f02cf5fd1e02f642c ruby-gtk2-0.16.0.tar.gz diff --git a/ruby-gtk/Pkgfile b/ruby-gtk/Pkgfile index 3e6bff3..0cd6bf1 100644 --- a/ruby-gtk/Pkgfile +++ b/ruby-gtk/Pkgfile @@ -7,7 +7,7 @@ name=ruby-gtk version=0.16.0 -release=2 +release=3 source=(http://dl.sourceforge.net/ruby-gnome2/ruby-gtk2-$version.tar.gz \ $name.diff) diff --git a/ruby-gtk/ruby-gtk.diff b/ruby-gtk/ruby-gtk.diff index 7af7819..fbaa20c 100644 --- a/ruby-gtk/ruby-gtk.diff +++ b/ruby-gtk/ruby-gtk.diff @@ -72,3 +72,25 @@ diff -aur ruby-gtk2-0.16.0.orig/gtk/src/rbgtk.h ruby-gtk2-0.16.0/gtk/src/rbgtk.h /* * Gtk::SelectionData +diff -aur ruby-gtk2-0.16.0.orig/glib/src/lib/glib-mkenums.rb ruby-gtk2-0.16.0/glib/src/lib/glib-mkenums.rb +--- ruby-gtk2-0.16.0.orig/glib/src/lib/glib-mkenums.rb 2006-12-29 14:17:29.000000000 +0100 ++++ ruby-gtk2-0.16.0/glib/src/lib/glib-mkenums.rb 2008-03-15 17:25:05.034366090 +0100 +@@ -33,16 +33,14 @@ + if const_lines.include? "<<" + @type = "flags" + @Type = "Flags" +- regexp = /^\s*([^\s]*)\s.*\n/ + else + @type = "enum" + @Type = "Enum" +- regexp = /^\s*([^\s,]*).*\n/ + end + consts = [] +- const_lines.scan(regexp){|name| ++ const_lines.scan(/^\s*([^\s,]*).*\n/) do |name| + consts << name[0] unless name[0] =~ /(^[\/\*]|^$)/ +- } ++ end + @prefix = extract_prefix(consts) + consts.each do |name| + # consts = [name, nick]

1 0

ports/core (2.4): udev: we're now mirroring the udev-config from LFS on crux.nu.
by crux＠crux.nu 15 Mar '08

15 Mar '08

commit 98a00916a0af13e375249e2032afeed55d9a198a Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Sat Mar 15 14:16:23 2008 +0100 udev: we're now mirroring the udev-config from LFS on crux.nu. diff --git a/udev/Pkgfile b/udev/Pkgfile index 465ee40..349bea6 100644 --- a/udev/Pkgfile +++ b/udev/Pkgfile @@ -6,7 +6,7 @@ name=udev version=118 release=1 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.… \ - http://www.linuxfromscratch.org/lfs/downloads/development/udev-config-20080… \ + http://crux.nu/files/distfiles/udev-config-20080217.tar.bz2 \ start_udev cdrom.rules cdsymlinks) build() {

1 0