IPFire-SCM October 2012

ipfire-scm@lists.ipfire.org

1 participants
59 discussions

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. bbfb087e7d9537a0332b2cccc8678581043e277a
by git＠ipfire.org 31 Oct '12

31 Oct '12

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 206ad2f1240ec3ba0786e7c46529dca2e7d55bfc
by git＠ipfire.org 30 Oct '12

30 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via 206ad2f1240ec3ba0786e7c46529dca2e7d55bfc (commit) via ef239becc4807e474cdc8d96dd1ce6bae6a30996 (commit) via 13d491616c1c8aa0f7243e230d28dbb02cb56b38 (commit) via 2c9a70d1581495587b49511f24480b15f89fe7a0 (commit) via ae0d87a63bfea638341bfe54093325707f2f9877 (commit) via ae522f767d6a1641aa605e3f0581ad0cf4497adc (commit) via e8fff1dfef9e4571a1d73441951214ad6122b59e (commit) via 0ebec256b0f59bca995550b1b622378c6ad169ce (commit) from a8c02fc396feddbc2c95076c2e38029ea4b58fc5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 206ad2f1240ec3ba0786e7c46529dca2e7d55bfc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 30 18:34:17 2012 +0100 make.sh fix package machine type package build. commit ef239becc4807e474cdc8d96dd1ce6bae6a30996 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 30 18:33:52 2012 +0100 cyrus-imapd: fix build. commit 13d491616c1c8aa0f7243e230d28dbb02cb56b38 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 30 15:35:46 2012 +0100 smartmontools: update to 6.0. commit 2c9a70d1581495587b49511f24480b15f89fe7a0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 30 14:57:24 2012 +0100 e2fsprogs: update to 1.42.6. commit ae0d87a63bfea638341bfe54093325707f2f9877 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 30 14:25:33 2012 +0100 udev: update to 141 and cleanup rules. commit ae522f767d6a1641aa605e3f0581ad0cf4497adc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Oct 29 13:34:40 2012 +0100 kudzu: removed. commit e8fff1dfef9e4571a1d73441951214ad6122b59e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Oct 29 11:16:57 2012 +0100 installer: blacklist cdrom/tapes as target. commit 0ebec256b0f59bca995550b1b622378c6ad169ce Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Oct 29 11:13:39 2012 +0100 installer: remove useless deepscan. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/compat-wireless | 2 +- config/rootfiles/common/e2fsprogs | 9 +- config/rootfiles/common/kudzu | 198 -------------------- config/rootfiles/common/udev | 31 ++-- config/rootfiles/installer/kudzu | 1 - config/rootfiles/packages/bluetooth | 2 +- config/udev/10-dvb.rules | 2 - config/udev/55-scsi-cdrom.rules | 2 - config/udev/dvb.sh | 2 - lfs/bluetooth | 4 +- lfs/compat-wireless | 2 +- lfs/cyrus-imapd | 2 +- lfs/e2fsprogs | 4 +- lfs/installer | 4 +- lfs/kudzu | 79 -------- lfs/linux2 | 3 - lfs/smartmontools | 6 +- lfs/udev | 33 ++-- make.sh | 3 +- src/install+setup/install/main.c | 10 +- src/install+setup/install/mountdest.sh | 4 + src/install+setup/install/probehw.sh | 76 -------- src/patches/kudzu-link-lintl.diff | 11 - src/patches/kudzu-usbnet.patch | 40 ---- .../linux-2.6.25.18-not_report_sysctl_1.23.patch | 14 -- src/patches/udev-125-netif_rename.patch | 47 ----- src/patches/udev-141_no_netif_rename.patch | 50 +++++ .../udev-config-6.2_persistent-storage-fix.patch | 12 -- .../udev-config-6.2_remove-lfs-usb-rule.patch | 11 - 29 files changed, 109 insertions(+), 555 deletions(-) delete mode 100644 config/rootfiles/common/kudzu delete mode 120000 config/rootfiles/installer/kudzu delete mode 100644 config/rootfiles/packages/directfb delete mode 100644 config/udev/10-dvb.rules delete mode 100644 config/udev/55-scsi-cdrom.rules delete mode 100755 config/udev/dvb.sh delete mode 100644 lfs/kudzu delete mode 100644 src/install+setup/install/probehw.sh delete mode 100644 src/patches/kudzu-link-lintl.diff delete mode 100644 src/patches/kudzu-usbnet.patch delete mode 100644 src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch delete mode 100644 src/patches/udev-125-netif_rename.patch create mode 100644 src/patches/udev-141_no_netif_rename.patch delete mode 100644 src/patches/udev-config-6.2_persistent-storage-fix.patch delete mode 100644 src/patches/udev-config-6.2_remove-lfs-usb-rule.patch Difference in files: diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless index 80018c8..5a562d2 100644 --- a/config/rootfiles/common/compat-wireless +++ b/config/rootfiles/common/compat-wireless @@ -1,2 +1,2 @@ -etc/udev/rules.d/50-compat_firmware.rules +lib/udev/rules.d/50-compat_firmware.rules lib/udev/compat_firmware.sh diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs index a293290..9622e6c 100644 --- a/config/rootfiles/common/e2fsprogs +++ b/config/rootfiles/common/e2fsprogs @@ -41,6 +41,7 @@ usr/bin/uuidgen #usr/include/blkid #usr/include/blkid/blkid.h #usr/include/blkid/blkid_types.h +#usr/include/com_err.h #usr/include/e2p #usr/include/e2p/e2p.h #usr/include/et @@ -54,7 +55,10 @@ usr/bin/uuidgen #usr/include/ext2fs/ext2_types.h #usr/include/ext2fs/ext2fs.h #usr/include/ext2fs/ext3_extents.h +#usr/include/ext2fs/qcow2.h #usr/include/ext2fs/tdb.h +#usr/include/quota +#usr/include/quota/mkquota.h #usr/include/ss #usr/include/ss/ss.h #usr/include/ss/ss_err.h @@ -69,18 +73,20 @@ usr/lib/libcom_err.so usr/lib/libe2p.so #usr/lib/libext2fs.a usr/lib/libext2fs.so +#usr/lib/libquota.a #usr/lib/libss.a usr/lib/libss.so #usr/lib/libuuid.a usr/lib/libuuid.so -#usr/lib/pkgconfig #usr/lib/pkgconfig/blkid.pc #usr/lib/pkgconfig/com_err.pc #usr/lib/pkgconfig/e2p.pc #usr/lib/pkgconfig/ext2fs.pc +#usr/lib/pkgconfig/quota.pc #usr/lib/pkgconfig/ss.pc #usr/lib/pkgconfig/uuid.pc usr/sbin/e2freefrag +usr/sbin/e4defrag usr/sbin/filefrag usr/sbin/mklost+found usr/sbin/uuidd @@ -117,6 +123,7 @@ usr/sbin/uuidd #usr/share/man/man8/e2image.8 #usr/share/man/man8/e2label.8 #usr/share/man/man8/e2undo.8 +#usr/share/man/man8/e4defrag.8 #usr/share/man/man8/filefrag.8 #usr/share/man/man8/findfs.8 #usr/share/man/man8/fsck.8 diff --git a/config/rootfiles/common/kudzu b/config/rootfiles/common/kudzu deleted file mode 100644 index 5776f0f..0000000 --- a/config/rootfiles/common/kudzu +++ /dev/null @@ -1,198 +0,0 @@ -#etc/rc.d/init.d/kudzu -#etc/sysconfig/kudzu -sbin/kudzu -#usr/include/kudzu -#usr/include/kudzu/adb.h -#usr/include/kudzu/alias.h -#usr/include/kudzu/ddc.h -#usr/include/kudzu/device.h -#usr/include/kudzu/firewire.h -#usr/include/kudzu/ide.h -#usr/include/kudzu/isapnp.h -#usr/include/kudzu/keyboard.h -#usr/include/kudzu/kudzu.h -#usr/include/kudzu/macio.h -#usr/include/kudzu/misc.h -#usr/include/kudzu/modules.h -#usr/include/kudzu/parallel.h -#usr/include/kudzu/pci.h -#usr/include/kudzu/pcmcia.h -#usr/include/kudzu/psaux.h -#usr/include/kudzu/sbus.h -#usr/include/kudzu/scsi.h -#usr/include/kudzu/serial.h -#usr/include/kudzu/usb.h -#usr/lib/libkudzu.a -#usr/lib/libkudzu_loader.a -#usr/lib/python2.7/lib2to3/tests/data/bom.pyc -#usr/lib/python2.7/lib2to3/tests/data/crlf.pyc -#usr/lib/python2.7/lib2to3/tests/data/different_encoding.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/bad_order.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/__init__.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_explicit.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_first.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_last.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_parrot.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_preorder.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/no_fixer_cls.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/parrot_example.pyc -#usr/lib/python2.7/lib2to3/tests/data/infinite_recursion.pyc -#usr/lib/python2.7/lib2to3/tests/data/py2_test_grammar.pyc -#usr/lib/python2.7/site-packages/_kudzumodule.so -#usr/lib/python2.7/site-packages/drv_libxml2.pyc -#usr/lib/python2.7/site-packages/kudzu.py -#usr/lib/python2.7/site-packages/kudzu.pyc -#usr/lib/python2.7/site-packages/libxslt.pyc -#usr/lib/python2.7/site-packages/snack.pyc -usr/sbin/kudzu -#usr/share/locale/ar -#usr/share/locale/ar/LC_MESSAGES -#usr/share/locale/ar/LC_MESSAGES/kudzu.mo -#usr/share/locale/as -#usr/share/locale/as/LC_MESSAGES -#usr/share/locale/as/LC_MESSAGES/kudzu.mo -#usr/share/locale/be/LC_MESSAGES/kudzu.mo -#usr/share/locale/bg -#usr/share/locale/bg/LC_MESSAGES -#usr/share/locale/bg/LC_MESSAGES/kudzu.mo -#usr/share/locale/bn -#usr/share/locale/bn/LC_MESSAGES -#usr/share/locale/bn/LC_MESSAGES/kudzu.mo -#usr/share/locale/bn_IN -#usr/share/locale/bn_IN/LC_MESSAGES -#usr/share/locale/bn_IN/LC_MESSAGES/kudzu.mo -#usr/share/locale/bs -#usr/share/locale/bs/LC_MESSAGES -#usr/share/locale/bs/LC_MESSAGES/kudzu.mo -#usr/share/locale/ca/LC_MESSAGES/kudzu.mo -#usr/share/locale/cs/LC_MESSAGES/kudzu.mo -#usr/share/locale/cy -#usr/share/locale/cy/LC_MESSAGES -#usr/share/locale/cy/LC_MESSAGES/kudzu.mo -#usr/share/locale/da/LC_MESSAGES/kudzu.mo -#usr/share/locale/de/LC_MESSAGES/kudzu.mo -#usr/share/locale/el/LC_MESSAGES/kudzu.mo -#usr/share/locale/en_GB/LC_MESSAGES/kudzu.mo -#usr/share/locale/es/LC_MESSAGES/kudzu.mo -#usr/share/locale/et/LC_MESSAGES/kudzu.mo -#usr/share/locale/eu_ES -#usr/share/locale/eu_ES/LC_MESSAGES -#usr/share/locale/eu_ES/LC_MESSAGES/kudzu.mo -#usr/share/locale/fi/LC_MESSAGES/kudzu.mo -#usr/share/locale/fr/LC_MESSAGES/kudzu.mo -#usr/share/locale/gl/LC_MESSAGES/kudzu.mo -#usr/share/locale/gu -#usr/share/locale/gu/LC_MESSAGES -#usr/share/locale/gu/LC_MESSAGES/kudzu.mo -#usr/share/locale/he -#usr/share/locale/he/LC_MESSAGES -#usr/share/locale/he/LC_MESSAGES/kudzu.mo -#usr/share/locale/hi -#usr/share/locale/hi/LC_MESSAGES -#usr/share/locale/hi/LC_MESSAGES/kudzu.mo -#usr/share/locale/hr/LC_MESSAGES/kudzu.mo -#usr/share/locale/hu/LC_MESSAGES/kudzu.mo -#usr/share/locale/hy -#usr/share/locale/hy/LC_MESSAGES -#usr/share/locale/hy/LC_MESSAGES/kudzu.mo -#usr/share/locale/id -#usr/share/locale/id/LC_MESSAGES -#usr/share/locale/id/LC_MESSAGES/kudzu.mo -#usr/share/locale/ilo -#usr/share/locale/ilo/LC_MESSAGES -#usr/share/locale/ilo/LC_MESSAGES/kudzu.mo -#usr/share/locale/is -#usr/share/locale/is/LC_MESSAGES -#usr/share/locale/is/LC_MESSAGES/kudzu.mo -#usr/share/locale/it/LC_MESSAGES/kudzu.mo -#usr/share/locale/ja/LC_MESSAGES/kudzu.mo -#usr/share/locale/ka -#usr/share/locale/ka/LC_MESSAGES -#usr/share/locale/ka/LC_MESSAGES/kudzu.mo -#usr/share/locale/kn -#usr/share/locale/kn/LC_MESSAGES -#usr/share/locale/kn/LC_MESSAGES/kudzu.mo -#usr/share/locale/ko/LC_MESSAGES/kudzu.mo -#usr/share/locale/ku -#usr/share/locale/ku/LC_MESSAGES -#usr/share/locale/ku/LC_MESSAGES/kudzu.mo -#usr/share/locale/lo -#usr/share/locale/lo/LC_MESSAGES -#usr/share/locale/lo/LC_MESSAGES/kudzu.mo -#usr/share/locale/lt -#usr/share/locale/lt/LC_MESSAGES -#usr/share/locale/lt/LC_MESSAGES/kudzu.mo -#usr/share/locale/lv -#usr/share/locale/lv/LC_MESSAGES -#usr/share/locale/lv/LC_MESSAGES/kudzu.mo -#usr/share/locale/mk -#usr/share/locale/mk/LC_MESSAGES -#usr/share/locale/mk/LC_MESSAGES/kudzu.mo -#usr/share/locale/ml -#usr/share/locale/ml/LC_MESSAGES -#usr/share/locale/ml/LC_MESSAGES/kudzu.mo -#usr/share/locale/mr -#usr/share/locale/mr/LC_MESSAGES -#usr/share/locale/mr/LC_MESSAGES/kudzu.mo -#usr/share/locale/ms -#usr/share/locale/ms/LC_MESSAGES -#usr/share/locale/ms/LC_MESSAGES/kudzu.mo -#usr/share/locale/my -#usr/share/locale/my/LC_MESSAGES -#usr/share/locale/my/LC_MESSAGES/kudzu.mo -#usr/share/locale/nb/LC_MESSAGES/kudzu.mo -#usr/share/locale/nl/LC_MESSAGES/kudzu.mo -#usr/share/locale/nn -#usr/share/locale/nn/LC_MESSAGES -#usr/share/locale/nn/LC_MESSAGES/kudzu.mo -#usr/share/locale/no -#usr/share/locale/no/LC_MESSAGES -#usr/share/locale/no/LC_MESSAGES/kudzu.mo -#usr/share/locale/or -#usr/share/locale/or/LC_MESSAGES -#usr/share/locale/or/LC_MESSAGES/kudzu.mo -#usr/share/locale/pa -#usr/share/locale/pa/LC_MESSAGES -#usr/share/locale/pa/LC_MESSAGES/kudzu.mo -#usr/share/locale/pl/LC_MESSAGES/kudzu.mo -#usr/share/locale/pt -#usr/share/locale/pt/LC_MESSAGES -#usr/share/locale/pt/LC_MESSAGES/kudzu.mo -#usr/share/locale/pt_BR/LC_MESSAGES/kudzu.mo -#usr/share/locale/ro/LC_MESSAGES/kudzu.mo -#usr/share/locale/ru/LC_MESSAGES/kudzu.mo -#usr/share/locale/si -#usr/share/locale/si/LC_MESSAGES -#usr/share/locale/si/LC_MESSAGES/kudzu.mo -#usr/share/locale/sk/LC_MESSAGES/kudzu.mo -#usr/share/locale/sl/LC_MESSAGES/kudzu.mo -#usr/share/locale/sq -#usr/share/locale/sq/LC_MESSAGES -#usr/share/locale/sq/LC_MESSAGES/kudzu.mo -#usr/share/locale/sr -#usr/share/locale/sr/LC_MESSAGES -#usr/share/locale/sr/LC_MESSAGES/kudzu.mo -#usr/share/locale/sr@Latn -#usr/share/locale/sr@Latn/LC_MESSAGES -#usr/share/locale/sr(a)Latn/LC_MESSAGES/kudzu.mo -#usr/share/locale/sv/LC_MESSAGES/kudzu.mo -#usr/share/locale/ta -#usr/share/locale/ta/LC_MESSAGES -#usr/share/locale/ta/LC_MESSAGES/kudzu.mo -#usr/share/locale/te -#usr/share/locale/te/LC_MESSAGES -#usr/share/locale/te/LC_MESSAGES/kudzu.mo -#usr/share/locale/tr/LC_MESSAGES/kudzu.mo -#usr/share/locale/uk/LC_MESSAGES/kudzu.mo -#usr/share/locale/ur -#usr/share/locale/ur/LC_MESSAGES -#usr/share/locale/ur/LC_MESSAGES/kudzu.mo -#usr/share/locale/vi -#usr/share/locale/vi/LC_MESSAGES -#usr/share/locale/vi/LC_MESSAGES/kudzu.mo -#usr/share/locale/wa -#usr/share/locale/wa/LC_MESSAGES -#usr/share/locale/wa/LC_MESSAGES/kudzu.mo -#usr/share/locale/zh_CN/LC_MESSAGES/kudzu.mo -#usr/share/locale/zh_TW/LC_MESSAGES/kudzu.mo -#usr/share/man/man8/kudzu.8 diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev index 58df07c..0d513f6 100644 --- a/config/rootfiles/common/udev +++ b/config/rootfiles/common/udev @@ -1,25 +1,18 @@ etc/modprobe.d/blacklist etc/scsi_id.config etc/udev -#etc/udev/dvb.sh #etc/udev/rules.d -#etc/udev/rules.d/05-udev-early.rules -#etc/udev/rules.d/10-dvb.rules -#etc/udev/rules.d/25-lfs.rules -#etc/udev/rules.d/26-modprobe.rules -#etc/udev/rules.d/27-firmware.rules #etc/udev/rules.d/30-persistent-network.rules -#etc/udev/rules.d/55-scsi-cdrom.rules -#etc/udev/rules.d/60-persistent-storage.rules -#etc/udev/rules.d/81-cdrom.rules #etc/udev/udev.conf #lib/firmware -lib/firmware/dirinfo -lib/libvolume_id.so.0 -lib/libvolume_id.so.0.85.0 +lib/libudev.so.0 +lib/libudev.so.0.2.0 +lib/libvolume_id.so.1 +lib/libvolume_id.so.1.1.0 lib/udev #lib/udev/ata_id #lib/udev/cdrom_id +#lib/udev/collect #lib/udev/create_floppy_devices #lib/udev/devices #lib/udev/devices/core @@ -33,27 +26,36 @@ lib/udev #lib/udev/edd_id #lib/udev/enable_codel #lib/udev/firmware.sh +#lib/udev/fstab_import #lib/udev/path_id +#lib/udev/rule_generator.functions #lib/udev/rules.d +#lib/udev/rules.d/50-firmware.rules #lib/udev/rules.d/50-udev-default.rules #lib/udev/rules.d/60-cdrom_id.rules #lib/udev/rules.d/60-persistent-input.rules +#lib/udev/rules.d/60-persistent-serial.rules #lib/udev/rules.d/60-persistent-storage-tape.rules #lib/udev/rules.d/60-persistent-storage.rules #lib/udev/rules.d/60-persistent-v4l.rules #lib/udev/rules.d/61-persistent-storage-edd.rules +#lib/udev/rules.d/75-cd-aliases-generator.rules +#lib/udev/rules.d/79-fstab_import.rules #lib/udev/rules.d/80-drivers.rules #lib/udev/rules.d/95-udev-late.rules #lib/udev/rules.d/99-codel.rules #lib/udev/scsi_id #lib/udev/usb_id #lib/udev/vol_id +#lib/udev/write_cd_rules +#lib/udev/write_net_rules sbin/udevadm sbin/udevd -sbin/udevsettle -usr/bin/udevinfo +#usr/include/libudev.h #usr/include/libvolume_id.h +usr/lib/libudev.so usr/lib/libvolume_id.so +#usr/lib/pkgconfig/libudev.pc #usr/lib/pkgconfig/libvolume_id.pc #usr/share/man/man7/udev.7 #usr/share/man/man8/ata_id.8 @@ -64,4 +66,5 @@ usr/lib/libvolume_id.so #usr/share/man/man8/scsi_id.8 #usr/share/man/man8/udevadm.8 #usr/share/man/man8/udevd.8 +#usr/share/man/man8/usb_id.8 #usr/share/man/man8/vol_id.8 diff --git a/config/rootfiles/installer/kudzu b/config/rootfiles/installer/kudzu deleted file mode 120000 index da66b91..0000000 --- a/config/rootfiles/installer/kudzu +++ /dev/null @@ -1 +0,0 @@ -../common/kudzu \ No newline at end of file diff --git a/config/rootfiles/packages/bluetooth b/config/rootfiles/packages/bluetooth index 278cbea..267e40e 100644 --- a/config/rootfiles/packages/bluetooth +++ b/config/rootfiles/packages/bluetooth @@ -6,7 +6,7 @@ etc/bluetooth/main.conf etc/bluetooth/network.conf etc/bluetooth/rfcomm.conf etc/dbus-1/system.d/bluetooth.conf -etc/udev/rules.d/24-bluetooth.rules +#lib/udev/rules.d/24-bluetooth.rules lib/firmware/BCM-LEGAL.txt lib/firmware/BCM2033-FW.bin lib/firmware/BCM2033-MD.hex diff --git a/config/rootfiles/packages/directfb b/config/rootfiles/packages/directfb deleted file mode 100644 index e69de29..0000000 diff --git a/config/udev/10-dvb.rules b/config/udev/10-dvb.rules deleted file mode 100644 index 5bcd40e..0000000 --- a/config/udev/10-dvb.rules +++ /dev/null @@ -1,2 +0,0 @@ -# Create DVB Devices -KERNEL=="dvb*", PROGRAM="/etc/udev/dvb.sh %k", NAME="%c" diff --git a/config/udev/55-scsi-cdrom.rules b/config/udev/55-scsi-cdrom.rules deleted file mode 100644 index f7ad37d..0000000 --- a/config/udev/55-scsi-cdrom.rules +++ /dev/null @@ -1,2 +0,0 @@ -# SCSI devices -BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" diff --git a/config/udev/dvb.sh b/config/udev/dvb.sh deleted file mode 100755 index 5405ffa..0000000 --- a/config/udev/dvb.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -/bin/echo $1 | /bin/sed -e 's,dvb$[0-9]$\.$[^0-9]*$$[0-9]$,dvb/adapter\1/\2\3,' diff --git a/lfs/bluetooth b/lfs/bluetooth index ca3176d..33e126c 100644 --- a/lfs/bluetooth +++ b/lfs/bluetooth @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -108,7 +108,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib cd $(DIR_SRC)/bluez-hcidump-1.42 && make $(MAKETUNING) cd $(DIR_SRC)/bluez-hcidump-1.42 && make install - mv -f /etc/udev/bluetooth.rules /etc/udev/rules.d/24-bluetooth.rules + mv -f /etc/udev/bluetooth.rules /lib/udev/rules.d/24-bluetooth.rules # Change bluetooth peername to Hostname-devicenumber sed -i -e 's|name "BlueZ (%d)";|name "%h-%d";|g' /etc/bluetooth/hcid.conf # Create empty config files diff --git a/lfs/compat-wireless b/lfs/compat-wireless index d51f2d0..4f94fe8 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -117,7 +117,7 @@ endif KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules # Install firmware udev files... - cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /etc/udev/rules.d/ + cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /lib/udev/rules.d/ cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/ -rm -rf $(DIR_APP) diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index 0a4fe2c..8f74c5a 100644 --- a/lfs/cyrus-imapd +++ b/lfs/cyrus-imapd @@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch - cp -f /usr/include/et/com_err.h /usr/include/com_err.h +# cp -f /usr/include/et/com_err.h /usr/include/com_err.h cd $(DIR_APP) && ./configure --prefix=/usr --with-service-path=/usr/lib/cyrus \ --with-cyrus-prefix=/usr/lib/cyrus --sysconfdir=/var/ipfire/cyrusimap \ --with-auth=unix --with-perl --with-sasl --with-idle=idled \ diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index 6844d3b..dff6393 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -24,7 +24,7 @@ include Config -VER = 1.41.11 +VER = 1.42.6 THISAPP = e2fsprogs-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fb507a40c2706bc38306f150d069e345 +$(DL_FILE)_MD5 = 9e444c240c1001b3292d108fbad0f49c install : $(TARGET) diff --git a/lfs/installer b/lfs/installer index 7661963..740793a 100644 --- a/lfs/installer +++ b/lfs/installer @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -61,7 +61,7 @@ $(TARGET) : -DNAME='\"$(NAME)\"' -DSNAME='\"$(SNAME)\"' -DVERSION='\"$(VERSION)\"' \ -DSLOGAN='\"$(SLOGAN)\"' -DCONFIG_ROOT='\"$(CONFIG_ROOT)\"' -DKERNEL_VERSION='\"$(KVER)\"'" cd $(DIR_APP)/install && install -v -m 0755 install probenic.sh \ - probehw.sh downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin + downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin #Patch ISO Name for download ... sed -i -e "s|ipfire.iso|download.ipfire.org/releases/ipfire-2.x/$(VERSION)-core$(CORE)…" \ /install/initrd/bin/downloadsource.sh diff --git a/lfs/kudzu b/lfs/kudzu deleted file mode 100644 index bc5ed02..0000000 --- a/lfs/kudzu +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.2.64 - -THISAPP = kudzu-$(VER) -DL_FILE = kudzu-$(VER).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 3eb6fae5e8f62409fd5149f2079f6060 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kudzu-usbnet.patch - rm -rf /usr/sbin/kudzu - cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make - cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make install - cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make install-program - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/linux2 b/lfs/linux2 index 9bedd53..0a53bdc 100644 --- a/lfs/linux2 +++ b/lfs/linux2 @@ -139,9 +139,6 @@ else cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch endif - # Not report deprecated syscall 1.23 (for kudzu) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch - # Reiser4 (don't check if fail (some patches are already in xen patchset) -cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1 diff --git a/lfs/smartmontools b/lfs/smartmontools index 1f9467a..a4ae11b 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 5.43 +VER = 6.0 THISAPP = smartmontools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a1cb2c3d8cc2de377037fe9e7cef40a9 +$(DL_FILE)_MD5 = 5646a07f5f4bee8e2e649de8c6b7ae87 install : $(TARGET) diff --git a/lfs/udev b/lfs/udev index 6e31c90..a16ba6f 100644 --- a/lfs/udev +++ b/lfs/udev @@ -24,10 +24,10 @@ include Config -VER = 125 +VER = 141 THISAPP = udev-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -36,13 +36,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) udev-config-6.2.tar.bz2 +objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -udev-config-6.2.tar.bz2 = $(DL_FROM)/udev-config-6.2.tar.bz2 -$(DL_FILE)_MD5 = be98e04cefdd9ca76b8fe7e92735ce29 -udev-config-6.2.tar.bz2_MD5 = 9ff2667ab0f7bfe8182966ef690078a0 +$(DL_FILE)_MD5 = 1670fe81cabf5161319c52084cf81134 install : $(TARGET) @@ -71,35 +69,32 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-125-netif_rename.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-141_no_netif_rename.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-125-ext4_wo_journal.patch rm -rf /lib/udev/devices - cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2 - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_persistent-storage-fix.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch install -dv /lib/{firmware,udev/devices/{pts,shm}} - echo "Put device firmwares here ..." > /lib/firmware/dirinfo mknod -m0666 /lib/udev/devices/null c 1 3 ln -sv /proc/self/fd /lib/udev/devices/fd ln -sv /proc/self/fd/0 /lib/udev/devices/stdin ln -sv /proc/self/fd/1 /lib/udev/devices/stdout ln -sv /proc/self/fd/2 /lib/udev/devices/stderr ln -sv /proc/kcore /lib/udev/devices/core + cd $(DIR_APP) && ./configure --disable-introspection --sbindir=/sbin --sysconfdir=/etc --libexecdir=/lib/udev cd $(DIR_APP) && make $(MAKETUNING) EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ extras/firmware extras/floppy extras/path_id \ extras/scsi_id extras/usb_id extras/volume_id" cd $(DIR_APP) && make DESTDIR=/ EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ extras/firmware extras/floppy extras/path_id \ extras/scsi_id extras/usb_id extras/volume_id" install - cd $(DIR_APP) && cp -v udev-config-6.2/[0-9]* /etc/udev/rules.d/ - cp -rf $(DIR_SRC)/config/udev/10-dvb.rules /etc/udev/rules.d/ - cp -rf $(DIR_SRC)/config/udev/55-scsi-cdrom.rules /etc/udev/rules.d/ - chmod 644 /etc/udev/rules.d/10-dvb.rules - chmod 644 /etc/udev/rules.d/55-scsi-cdrom.rules - cp -rf $(DIR_SRC)/config/udev/dvb.sh /etc/udev/ - chmod 755 /etc/udev/dvb.sh + + # Disable net generator rule. This does not work with the setup. + rm -f /lib/udev/rules.d/75-persistent-net-generator.rules + + # Create rule file for the setup touch /etc/udev/rules.d/30-persistent-network.rules + + # Blacklist some modules cp -vf $(DIR_SRC)/config/udev/blacklist /etc/modprobe.d/blacklist # Install codel rules. diff --git a/make.sh b/make.sh index 781d477..59b8d51 100755 --- a/make.sh +++ b/make.sh @@ -519,7 +519,6 @@ buildipfire() { ipfiremake mISDNuser ipfiremake capi4k-utils ipfiremake hwdata - ipfiremake kudzu ipfiremake logrotate ipfiremake logwatch ipfiremake misc-progs @@ -867,7 +866,7 @@ ipfirepackages() { ipfiremake core-updates local i - for i in $(find $BASEDIR/config/rootfiles/packages{${machine},} -maxdepth 1 -type f); do + for i in $(find $BASEDIR/config/rootfiles/packages{/${MACHINE},} -maxdepth 1 -type f); do i=$(basename ${i}) if [ -e $BASEDIR/lfs/$i ]; then ipfiredist $i diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 319dfde..9513a7f 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -57,7 +57,6 @@ int main(int argc, char *argv[]) int choice; int i; int found = 0; - int firstrun = 0; char shortlangname[10]; char message[1000]; char title[STRING_SIZE]; @@ -203,13 +202,8 @@ int main(int argc, char *argv[]) found = 1; break; case 10: // No harddisk found - if (firstrun == 1) { - errorbox(ctr[TR_NO_HARDDISK]); - goto EXIT; - } - // Do this if the kudzu-scan fails... - runcommandwithstatus("/bin/probehw.sh deep-scan", ctr[TR_PROBING_HARDWARE]); - firstrun = 1; + errorbox(ctr[TR_NO_HARDDISK]); + goto EXIT; } } diff --git a/src/install+setup/install/mountdest.sh b/src/install+setup/install/mountdest.sh index 749d4fa..776962a 100644 --- a/src/install+setup/install/mountdest.sh +++ b/src/install+setup/install/mountdest.sh @@ -72,6 +72,10 @@ for path in /sys/block/*; do fd*) continue ;; + # Cd/Tape. + sr*) + continue + ;; esac # Replace any exclamation marks (e.g. cciss!c0d0). diff --git a/src/install+setup/install/probehw.sh b/src/install+setup/install/probehw.sh deleted file mode 100644 index c56462e..0000000 --- a/src/install+setup/install/probehw.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -echo "Detecting Hardware..." -for MODULE in $(kudzu -qps -t 30 | grep driver: | cut -d ' ' -f 2 | sort | uniq); do - if [ "${MODULE}" = "unknown" ] || \ - [ "${MODULE}" = "ignore" ] || \ - [ "${MODULE}" = "" ]; then - continue - fi - MODULE=$(find /lib/modules -name $(echo $MODULE | sed -e 's/[_-]/*/g')* 2>/dev/null) - [ "${MODULE}" == "" ] && continue - MODULE=$(basename $MODULE | cut -d. -f1 | head -1) - - if grep -Eqe "^${MODULE} " /proc/modules; then - continue - fi - echo -n "Loading ${MODULE}" - modprobe ${MODULE} >/dev/null 2>&1 - echo " --> ecode: $?" -done - -sleep 10 - -if [ $# -eq 0 ]; then - exit 0 -fi - -## If the autodetection fails we will try to load every module... -## Do this only when we want... - -for i in a b c d e f g; do - if [ ! -e /dev/sd$i ]; then - DEVICE="/dev/sd$i" - echo "Checking for: $DEVICE" - break - fi -done - -for MODULE in $(ls /lib/modules/*/kernel/drivers/ata && ls /lib/modules/*/kernel/drivers/scsi); do - MODULE=`basename $MODULE | awk -F. '{ print $1 }'` - - echo -n "Probing for $MODULE" - modprobe $MODULE >/dev/null 2>&1 - RETVAL=$? - echo " --> ecode: $RETVAL" - if [ "$RETVAL" -eq "0" ]; then - sleep 3 - if [ -e "$DEVICE" ]; then - break - fi - fi - -done - -sleep 5 - -exit 0 diff --git a/src/patches/kudzu-link-lintl.diff b/src/patches/kudzu-link-lintl.diff deleted file mode 100644 index ec3974c..0000000 --- a/src/patches/kudzu-link-lintl.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- tmp/kudzu-1.2.60/Makefile 2006-09-05 15:56:21.000000000 +0200 -+++ build/usr/src/kudzu-1.2.60/Makefile 2006-11-20 15:08:32.000000000 +0100 -@@ -63,7 +63,7 @@ - $(RANLIB) libkudzu.a - - kudzu: libkudzu.a $(KUDOBJS) po -- $(CC) $(CFLAGS) $(LDFLAGS) $(KUDOBJS) -o kudzu -L. -lkudzu -L. -lpci -Wl,-Bstatic -lpopt -Wl,-Bdynamic -+ $(CC) $(CFLAGS) $(LDFLAGS) $(KUDOBJS) -o kudzu -L. -lkudzu -L. -lpci -L. -lintl -Wl,-Bstatic -lpopt -Wl,-Bdynamic - - module_upgrade: libkudzu.a module_upgrade.c - $(CC) $(CFLAGS) $(LDFLAGS) module_upgrade.c -o module_upgrade -L. -lkudzu -lpci diff --git a/src/patches/kudzu-usbnet.patch b/src/patches/kudzu-usbnet.patch deleted file mode 100644 index 185d1a7..0000000 --- a/src/patches/kudzu-usbnet.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur kudzu-1.2.64.org/usb.c kudzu-1.2.64/usb.c ---- kudzu-1.2.64.org/usb.c 2006-11-28 17:58:58.000000000 +0100 -+++ kudzu-1.2.64/usb.c 2009-07-16 20:33:19.000000000 +0200 -@@ -261,13 +261,33 @@ - t->desc = strdup(t->usbprod); - else - asprintf(&t->desc,"Unknown USB device 0x%x:0x%x",t->vendorId,t->deviceId); -- if (t->driver && (!strcmp(t->driver, "pegasus") || -+ if (t->driver && (!strcmp(t->driver, "asix") || - !strcmp(t->driver, "catc") || -+ !strcmp(t->driver, "cdc_ether") || -+ !strcmp(t->driver, "cdc_subset") || -+ !strcmp(t->driver, "dm9601") || -+ !strcmp(t->driver, "gl620a") || - !strcmp(t->driver, "kaweth") || -+ !strcmp(t->driver, "mcs7830") || -+ !strcmp(t->driver, "net1080") || -+ !strcmp(t->driver, "pegasus") || -+ !strcmp(t->driver, "plusb") || -+ !strcmp(t->driver, "rndis_host") || - !strcmp(t->driver, "rtl8150") || -- !strcmp(t->driver, "ax8817x") || -+ !strcmp(t->driver, "zaurus") || -+ !strcmp(t->driver, "rt2500usb") || -+ !strcmp(t->driver, "rt2800usb") || -+ !strcmp(t->driver, "rt2x00usb") || -+ !strcmp(t->driver, "rt73usb") || -+ !strcmp(t->driver, "ar9170usb") || -+ !strcmp(t->driver, "libertas_tf_usb") || -+ !strcmp(t->driver, "at76c50x-usb") || -+ !strcmp(t->driver, "p54usb") || -+ !strcmp(t->driver, "rndis_wlan") || -+ !strcmp(t->driver, "rtl8187") || -+ !strcmp(t->driver, "usb8xxx") || - !strcmp(t->driver, "zd1201") || -- !strcmp(t->driver, "asix") || -+ !strcmp(t->driver, "zd1211rw") || - !strcmp(t->driver, "usbnet"))) { - if (t->type == CLASS_OTHER) - t->type = CLASS_NETWORK; diff --git a/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch b/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch deleted file mode 100644 index 7419c05..0000000 --- a/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur linux-2.6.25.18.org/kernel/sysctl.c linux-2.6.25.18/kernel/sysctl.c ---- linux-2.6.25.18.org/kernel/sysctl.c 2008-10-09 04:58:32.000000000 +0200 -+++ linux-2.6.25.18/kernel/sysctl.c 2008-10-10 18:03:33.000000000 +0200 -@@ -2807,6 +2807,10 @@ - if ((args->nlen == 2) && (name[0] == CTL_KERN) && (name[1] == KERN_VERSION)) - return 0; - -+ /* Ignore kudzu syscall 1.23 */ -+ if ((args->nlen == 2) && (name[0] == 1) && (name[1] == 23)) -+ return 0; -+ - if (msg_count < 5) { - msg_count++; - printk(KERN_INFO diff --git a/src/patches/udev-125-netif_rename.patch b/src/patches/udev-125-netif_rename.patch deleted file mode 100644 index c80b05a..0000000 --- a/src/patches/udev-125-netif_rename.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Nur udev-125.vanilla/udev_device.c udev-125/udev_device.c ---- udev-125.vanilla/udev_device.c 2008-07-18 16:26:55.000000000 +0200 -+++ udev-125/udev_device.c 2010-07-25 18:15:12.289242450 +0200 -@@ -123,42 +123,7 @@ - if (retval == 0) - kernel_log(ifr); - else { -- int loop; -- -- /* see if the destination interface name already exists */ -- if (errno != EEXIST) { -- err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno)); -- goto exit; -- } -- -- /* free our own name, another process may wait for us */ -- strlcpy(ifr.ifr_newname, udev->dev->kernel, IFNAMSIZ); -- strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ); -- retval = ioctl(sk, SIOCSIFNAME, &ifr); -- if (retval != 0) { -- err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno)); -- goto exit; -- } -- -- /* wait 30 seconds for our target to become available */ -- strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ); -- strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ); -- loop = 30 * 20; -- while (loop--) { -- retval = ioctl(sk, SIOCSIFNAME, &ifr); -- if (retval == 0) { -- kernel_log(ifr); -- break; -- } -- -- if (errno != EEXIST) { -- err("error changing net interface name %s to %s: %s\n", -- ifr.ifr_name, ifr.ifr_newname, strerror(errno)); -- break; -- } -- dbg("wait for netif '%s' to become free, loop=%i\n", udev->name, (30 * 20) - loop); -- usleep(1000 * 1000 / 20); -- } -+ err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno)); - } - - exit: diff --git a/src/patches/udev-141_no_netif_rename.patch b/src/patches/udev-141_no_netif_rename.patch new file mode 100644 index 0000000..fcc5009 --- /dev/null +++ b/src/patches/udev-141_no_netif_rename.patch @@ -0,0 +1,50 @@ +diff -Naur udev-141.org/udev/udev-event.c udev-141/udev/udev-event.c +--- udev-141.org/udev/udev-event.c 2009-02-24 15:08:35.000000000 +0100 ++++ udev-141/udev/udev-event.c 2012-10-30 12:27:00.262833136 +0100 +@@ -486,45 +486,8 @@ + if (err == 0) + rename_netif_kernel_log(ifr); + else { +- int loop; +- +- /* see if the destination interface name already exists */ +- if (errno != EEXIST) { +- err(event->udev, "error changing netif name %s to %s: %m\n", +- ifr.ifr_name, ifr.ifr_newname); +- goto exit; +- } +- +- /* free our own name, another process may wait for us */ +- util_strlcpy(ifr.ifr_newname, udev_device_get_sysname(dev), IFNAMSIZ); +- util_strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ); +- err = ioctl(sk, SIOCSIFNAME, &ifr); +- if (err != 0) { +- err(event->udev, "error changing netif name %s to %s: %m\n", ++ err(event->udev, "error changing netif name %s to %s: %m\n", + ifr.ifr_name, ifr.ifr_newname); +- goto exit; +- } +- +- /* wait 90 seconds for our target to become available */ +- util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ); +- util_strlcpy(ifr.ifr_newname, event->name, IFNAMSIZ); +- loop = 90 * 20; +- while (loop--) { +- err = ioctl(sk, SIOCSIFNAME, &ifr); +- if (err == 0) { +- rename_netif_kernel_log(ifr); +- break; +- } +- +- if (errno != EEXIST) { +- err(event->udev, "error changing net interface name %s to %s: %m\n", +- ifr.ifr_name, ifr.ifr_newname); +- break; +- } +- dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n", +- event->name, (90 * 20) - loop); +- usleep(1000 * 1000 / 20); +- } + } + exit: + close(sk); diff --git a/src/patches/udev-config-6.2_persistent-storage-fix.patch b/src/patches/udev-config-6.2_persistent-storage-fix.patch deleted file mode 100644 index 172091a..0000000 --- a/src/patches/udev-config-6.2_persistent-storage-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur udev-config-6.2.org/60-persistent-storage.rules udev-config-6.2/60-persistent-storage.rules ---- udev-config-6.2.org/60-persistent-storage.rules 2006-05-13 01:03:13.000000000 +0200 -+++ udev-config-6.2/60-persistent-storage.rules 2010-08-14 11:08:35.000000000 +0200 -@@ -9,7 +9,7 @@ - - # never access removable ide devices, the drivers are causing event loops on open() - KERNEL=="hd*[!0-9]", SYSFS{removable}=="1", DRIVER=="ide-cs|ide-floppy", GOTO="persistent_storage_end" --KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_storage_end" -+KERNEL=="hd*[0-9]", SYSFS{removable}=="1", GOTO="persistent_storage_end" - - # for partitions import parent information - KERNEL=="*[0-9]", IMPORT{parent}=="ID_*" diff --git a/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch b/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch deleted file mode 100644 index ef02bf7..0000000 --- a/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur udev-config-6.2.org/25-lfs.rules udev-config-6.2/25-lfs.rules ---- udev-config-6.2.org/25-lfs.rules 2006-07-14 23:29:28.000000000 +0200 -+++ udev-config-6.2/25-lfs.rules 2010-12-21 18:55:40.375602794 +0100 -@@ -84,7 +84,6 @@ - - # USB devices go in their own subdirectory - --SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", NAME="%c" - KERNEL=="hiddev*", NAME="usb/%k" - KERNEL=="auer*", NAME="usb/%k" - KERNEL=="legousbtower*", NAME="usb/%k" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. a2776645f459c0d041de17f6f38f25f73262bfd0
by git＠ipfire.org 28 Oct '12

28 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via a2776645f459c0d041de17f6f38f25f73262bfd0 (commit) via 245262a6750a66d673cbd2cb81bf0193602c787a (commit) via 998f963767072176839d35bbe9b5378f718af3fa (commit) via 60b79c9941f611e92c545bf4bc6fe1f62d5bccb9 (commit) from 76d991f79dbecc7a272371072da55807987764f3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a2776645f459c0d041de17f6f38f25f73262bfd0 Merge: 245262a 60b79c9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 28 11:47:26 2012 +0100 Merge remote-tracking branch 'stevee/util-linux-update' commit 245262a6750a66d673cbd2cb81bf0193602c787a Merge: 76d991f 998f963 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Oct 28 11:47:19 2012 +0100 Merge remote-tracking branch 'stevee/boost-update' commit 998f963767072176839d35bbe9b5378f718af3fa Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Oct 22 21:25:19 2012 +0200 boost: Update to 1.51.0. Major update to latest stable release. * Switch from cmake to interal build system. * Splitt boost into a lot of subpackages. * Boost is an umbrella package which requires all subpackages. * Build boost libraries for python and python3. commit 60b79c9941f611e92c545bf4bc6fe1f62d5bccb9 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Oct 27 17:11:48 2012 +0200 util-linux: Update to 2.22.1. This is a bugfixing release. ----------------------------------------------------------------------- Summary of changes: boost/boost.nm | 353 ++++++++++++++++++-- boost/patches/boost-1.41.0-iostreams-zlib.patch | 21 -- boost/patches/boost-1.41.0-mapnik.patch | 21 -- .../boost-1.41.0-shared_ptr_serialization.patch | 14 - .../boost-1.51.0-context-no-exec-stack.patch | 28 ++ boost/patches/boost-graph-compile.patch | 12 - util-linux/util-linux.nm | 4 +- 7 files changed, 354 insertions(+), 99 deletions(-) delete mode 100644 boost/patches/boost-1.41.0-iostreams-zlib.patch delete mode 100644 boost/patches/boost-1.41.0-mapnik.patch delete mode 100644 boost/patches/boost-1.41.0-shared_ptr_serialization.patch create mode 100644 boost/patches/boost-1.51.0-context-no-exec-stack.patch delete mode 100644 boost/patches/boost-graph-compile.patch Difference in files: diff --git a/boost/boost.nm b/boost/boost.nm index 5505a90..0719943 100644 --- a/boost/boost.nm +++ b/boost/boost.nm @@ -4,8 +4,11 @@ ############################################################################### name = boost -version = 1.41.0 -release = 2 +ver_major = 1 +ver_minor = 51 +ver_plevel = 0 +version = %{ver_major}.%{ver_minor}.%{ver_plevel} +release = 1 groups = System/Libraries url = http://www.boost.org/ @@ -20,58 +23,348 @@ description libraries are suitable for eventual standardization. end -source_dl = # Cannot find the cmake file. -sources = %{thisapp}.cmake0.tar.gz +thisapp = %{name}_%{ver_major}_%{ver_minor}_%{ver_plevel} -CFLAGS += -fno-strict-aliasing -CXXFLAGS += -fno-strict-aliasing - -DIR_APP = %{DIR_SRC}/%{thisapp}.cmake0 +source_dl = http://sourceforge.net/projects/boost/files/%{name}/%{version}/ build requires - cmake + bzip2-devel gcc-c++ + python-devel + python3-devel zlib-devel end + CFLAGS += -fno-strict-aliasing + CXXFLAGS += -fno-strict-aliasing + + configure_options = \ + --layout=tagged \ + --without-mpi \ + --without-graph_parallel \ + --build-dir=serial \ + \ + cflags="%{CFLAGS}" \ + cxxflags="%{CXXFLAGS}" \ + variant=release \ + threading=single,multi \ + debug-symbols=on \ + python=%{python_version} \ + pch=off + + # Get python3 abi flags. + python3_abiflags = %(%{python3}-config --abiflags) + prepare_cmds + # Create build dir. mkdir -pv %{DIR_APP}/serial + + # Bootstrap build environment. + ./bootstrap.sh --with-toolset=gcc + + # Enable boost lib for python3. + cat >> ./tools/build/v2/user-config.jam << EOF + using python : %{python3_version} : %{python3} : %{includedir}/python%{python3_version}%{python3_abiflags} : %{libdir}/python%{python3_version} ; + EOF end build - cd %{DIR_APP}/serial && \ - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUILD_TESTS="NONE" \ - -DENABLE_SINGLE_THREADED=YES \ - -DINSTALL_VERSIONED=OFF \ - -DWITH_MPI=OFF \ - -DENABLE_STATIC=OFF \ - -DENABLE_DEBUG=OFF \ - -DBOOST_LIB_INSTALL_DIR=%{libdir} \ - .. - - make VERBOSE=1 #%{PARALLELISMFLAGS} + # Build boost. + ./b2 -d+2 -q %{PARALLELISMFLAGS} %{configure_options} stage end install - cd %{DIR_APP}/serial && make install DESTDIR=%{BUILDROOT} - - # Kill any debug library versions that may show up un-invited. - rm -f %{BUILDROOT}%{libdir}/*-d.* - - # Remove cmake configuration files used to build the Boost libraries - find %{BUILDROOT}%{libdir} -name '*.cmake' -exec rm -f {} \; + # Install boost. + ./b2 %{PARALLELISMFLAGS} %{configure_options} install \ + --prefix=%{BUILDROOT}%{prefix} \ + --libdir=%{BUILDROOT}%{libdir} end end packages + # boost is just a umbrella package, that pulls all other boost + # components, except the python3 sub-package. package %{name} + requires + boost-chrono = %{thisver} + boost-context = %{thisver} + boost-date-time = %{thisver} + boost-filesystem = %{thisver} + boost-graph = %{thisver} + boost-iostreams = %{thisver} + boost-locale = %{thisver} + boost-math = %{thisver} + boost-program-options = %{thisver} + boost-python = %{thisver} + boost-random = %{thisver} + boost-regex = %{thisver} + boost-serialization = %{thisver} + boost-signals = %{thisver} + boost-system = %{thisver} + boost-test = %{thisver} + boost-thread = %{thisver} + boost-timer = %{thisver} + boost-wave = %{thisver} + end + end + + package %{name}-chrono + summary = Run-Time component of boost chrono library. + description + Run-Time support for Boost.Chrono, a set of useful time utilities. + end + + files + %{libdir}/libboost_chrono*.so.* + end + end + + package %{name}-context + summary = Run-Time component of boost context library. + description + A foundational library that provides a sort of cooperative multitasking + on asingle thread. + end + + files + %{libdir}/libboost_context*.so.* + end + end + + package %{name}-date-time + summary = Run-Time component of boost date-time library. + description + Run-Time support for Boost Date Time, set of date-time libraries based + on generic programming concepts. + end + + files + %{libdir}/libboost_date_time*.so.* + end + end + + package %{name}-filesystem + summary = Run-Time component of boost filesystem library. + description + Run-Time support for the Boost Filesystem Library, which provides + portable facilities to query and manipulate paths, files, and + directories. + end + + files + %{libdir}/libboost_filesystem*.so.* + end + end + + package %{name}-graph + summary = Run-Time component of boost graph library. + description + Run-Time support for the BGL graph library. BGL interface and graph + components are generic, in the same sense as the the Standard Template + Library (STL). + end + + files + %{libdir}/libboost_graph*.so.* + end + end + + package %{name}-iostreams + summary = Run-Time component of boost iostreams library. + description + Run-Time support for Boost.IOStreams, a framework for defining streams, + stream buffers and i/o filters. + end + + files + %{libdir}/libboost_iostreams*.so.* + end + end + + package %{name}-locale + summary = Run-Time component of boost locale library. + description + Run-Time support for Boost.Locale, a set of localization and Unicode + handling tools. + end + + files + %{libdir}/libboost_locale*.so.* + end + end + + package %{name}-math + summary = Math functions for boost TR1 library. + description + Run-Time support for C99 and C++ TR1 C-style Functions from math + portion of Boost.TR1. + end + + files + %{libdir}/libboost_math*.so.* + end + end + + package %{name}-program-options + summary = Run-Time component of boost program_options library. + description + Run-Time support of boost program options library, which allows program + developers to obtain (name, value) pairs from the user, via + conventional methods such as command line and configuration file. + end + + files + %{libdir}/libboost_program_options*.so.* + end + end + + package %{name}-python + summary = Run-Time component of boost python library. + description + The Boost Python Library is a framework for interfacing Python and + C++. It allows you to quickly and seamlessly expose C++ classes + functions and objects to Python, and vice versa, using no special + tools -- just your C++ compiler. This package contains run-time + support for Boost Python Library. + end + + files + %{libdir}/libboost_python.so.* + %{libdir}/libboost_python-mt.so.* + end + end + + package %{name}-python3 + summary = Run-Time component of boost python library for Python 3. + description + The Boost Python Library is a framework for interfacing Python and + C++. It allows you to quickly and seamlessly expose C++ classes + functions and objects to Python, and vice versa, using no special + tools -- just your C++ compiler. This package contains run-time + support for Boost Python Library compiled for Python 3. + end + + files + %{libdir}/libboost_python3*.so.* + end + end + + package %{name}-random + summary = Run-Time component of boost random library. + description + Run-Time support for boost random library. + end + + files + %{libdir}/libboost_random*.so.* + end + end + + package %{name}-regex + summary = Run-Time component of boost regular expression library. + description + Run-Time support for boost regular expression library. + end + + files + %{libdir}/libboost_regex*.so.* + end + end + + package %{name}-serialization + summary = Run-Time component of boost serialization library. + description + Run-Time support for serialization for persistence and marshaling. + end + + files + %{libdir}/libboost_serialization*.so.* + %{libdir}/libboost_wserialization*so.* + end + end + + package %{name}-signals + summary = Run-Time component of boost signals and slots library. + description + Run-Time support for managed signals & slots callback implementation. + end + + files + %{libdir}/libboost_signals*.so.* + end + end + + package %{name}-system + summary = Run-Time component of boost system support library. + description + Run-Time component of Boost operating system support library, including + the diagnostics support that will be part of the C++0x standard + library. + end + + files + %{libdir}/libboost_system*.so.* + end + end + + package %{name}-test + summary = Run-Time component of boost test library. + description + Run-Time support for simple program testing, full unit testing, and for + program execution monitoring. + end + + files + %{libdir}/libboost_prg_exec_monitor*.so.* + %{libdir}/libboost_unit_test_framework*.so.* + end + end + + package %{name}-thread + summary = Run-Time component of boost thread library. + description + Run-Time component Boost.Thread library, which provides classes and + functions for managing multiple threads of execution, and for + synchronizing data between the threads or providing separate copies of + data specific to individual threads. + end + + files + %{libdir}/libboost_thread*.so.* + end + end + + package %{name}-timer + summary = Run-Time component of boost timer library. + description + "How long does my C++ code take to run?" + The Boost Timer library answers that question and does so portably, + with as little as one #include and one additional line of code. + end + + files + %{libdir}/libboost_timer*.so.* + end + end + + package %{name}-wave + summary = Run-Time component of boost C99/C++ pre-processing library. + description + Run-Time support for the Boost.Wave library, a Standards conforming, + and highly configurable implementation of the mandated C99/C++ + pre-processor functionality. + end + + files + %{libdir}/libboost_wave*.so.* + end + end package %{name}-devel template DEVEL + + requires = %{name} = %{thisver} end package %{name}-debuginfo diff --git a/boost/patches/boost-1.41.0-iostreams-zlib.patch b/boost/patches/boost-1.41.0-iostreams-zlib.patch deleted file mode 100644 index 09b900c..0000000 --- a/boost/patches/boost-1.41.0-iostreams-zlib.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: /trunk/boost/iostreams/filter/zlib.hpp -=================================================================== ---- a/boost/iostreams/filter/zlib.hpp (revision 45783) -+++ b/boost/iostreams/filter/zlib.hpp (revision 57610) -@@ -21,4 +21,5 @@ - #include <new> - #include <boost/config.hpp> // MSVC, STATIC_CONSTANT, DEDUCED_TYPENAME, DINKUM. -+#include <boost/cstdint.hpp> // uint*_t - #include <boost/detail/workaround.hpp> - #include <boost/iostreams/constants.hpp> // buffer size. -@@ -44,7 +45,7 @@ - // Typedefs - --typedef unsigned int uint; --typedef unsigned char byte; --typedef unsigned long ulong; -+typedef uint32_t uint; -+typedef uint8_t byte; -+typedef uint32_t ulong; - - // Prefix 'x' prevents symbols from being redefined when Z_PREFIX is defined diff --git a/boost/patches/boost-1.41.0-mapnik.patch b/boost/patches/boost-1.41.0-mapnik.patch deleted file mode 100644 index c7a0a18..0000000 --- a/boost/patches/boost-1.41.0-mapnik.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/iostreams/device/mapped_file.hpp\~ /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/iostreams/device/mapped_file.hpp ---- a/boost/iostreams/device/mapped_file.hpp~ 2009-12-17 20:51:56.000000000 +0100 -+++ b/boost/iostreams/device/mapped_file.hpp 2010-01-25 10:33:43.000000000 +0100 -@@ -4,6 +4,9 @@ - // Distributed under the Boost Software License, Version 1.0. (See accompanying - // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt.) - -+#ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED -+#define BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED -+ - #if defined(_MSC_VER) && (_MSC_VER >= 1020) - # pragma once - #endif -@@ -591,3 +594,5 @@ operator^=(mapped_file::mapmode& a, mapp - } } // End namespaces iostreams, boost. - - #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas -+ -+#endif // #ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED - -Diff finished. Mon Jan 25 10:33:55 2010 diff --git a/boost/patches/boost-1.41.0-shared_ptr_serialization.patch b/boost/patches/boost-1.41.0-shared_ptr_serialization.patch deleted file mode 100644 index f1312b6..0000000 --- a/boost/patches/boost-1.41.0-shared_ptr_serialization.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp\~ /home/petr/fedora/boost/devel/boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp ---- boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp~ 2009-12-17 20:51:55.000000000 +0100 -+++ boost-1.41.0.cmake0/boost/archive/shared_ptr_helper.hpp 2010-02-22 14:13:18.000000000 +0100 -@@ -108,7 +108,7 @@ public: - struct non_polymorphic { - static const boost::serialization::extended_type_info * - get_object_identifier(T & t){ -- return boost::serialization::singleton< -+ return &boost::serialization::singleton< - BOOST_DEDUCED_TYPENAME - boost::serialization::type_info_implementation<T>::type - >::get_const_instance(); - -Diff finished. Mon Feb 22 14:13:38 2010 diff --git a/boost/patches/boost-1.51.0-context-no-exec-stack.patch b/boost/patches/boost-1.51.0-context-no-exec-stack.patch new file mode 100644 index 0000000..dee44ad --- /dev/null +++ b/boost/patches/boost-1.51.0-context-no-exec-stack.patch @@ -0,0 +1,28 @@ +diff -Nur a/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S b/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S +--- a/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S 2012-07-03 21:12:31.000000000 +0200 ++++ b/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S 2012-10-27 19:25:08.016850683 +0200 +@@ -45,6 +45,10 @@ + * * + * *****************************************************************/ + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif ++ + .text + .globl jump_fcontext + .align 2 +diff -Nur a/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S b/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S +--- a/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S 2012-07-03 21:12:31.000000000 +0200 ++++ b/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S 2012-10-27 19:24:34.166680913 +0200 +@@ -31,6 +31,10 @@ + * * + * *****************************************************************/ + ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif ++ + .text + .globl jump_fcontext + .align 2 diff --git a/boost/patches/boost-graph-compile.patch b/boost/patches/boost-graph-compile.patch deleted file mode 100644 index fe8384b..0000000 --- a/boost/patches/boost-graph-compile.patch +++ /dev/null @@ -1,12 +0,0 @@ -*** a/boost/graph/distributed/detail/mpi_process_group.ipp.orig 2009-12-16 15:46:32.410223363 -0800 ---- b/boost/graph/distributed/detail/mpi_process_group.ipp 2009-12-16 15:47:28.700348300 -0800 -*************** -*** 19,24 **** ---- 19,25 ---- - #endif - - #include <cassert> -+ #include <cstdio> - #include <algorithm> - #include <boost/graph/parallel/detail/untracked_pair.hpp> - #include <numeric> diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 676683d..60a54fc 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -5,9 +5,11 @@ name = util-linux major_ver = 2.22 -version = %{major_ver} +minor_ver = 1 +version = %{major_ver}.%{minor_ver} release = 1 +maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base url = http://kernel.org/~kzak/util-linux/ license = GPLv2 and GPLv2+ and BSD with advertising and Public Domain hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 76d991f79dbecc7a272371072da55807987764f3
by git＠ipfire.org 27 Oct '12

27 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 76d991f79dbecc7a272371072da55807987764f3 (commit) via 30e0da8033bc00a6d2b767e3394207cba6633331 (commit) via 36a77b3a223c44565f3ff3abe3ca873e238c21b6 (commit) via f54c3df3a171cef25408fe77dbcadf7b129643ee (commit) via effd5ec1e2b0c50f9efd9a7355098e41beac7b0a (commit) via a04cd3604534bb37b950d3dbfb1c680e34891849 (commit) via d3eddbcf9510aa615dcaa4b5acabf84cee061a98 (commit) from d58a8ffee17f2a4867c0653b4d33666ec40f5b69 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 76d991f79dbecc7a272371072da55807987764f3 Merge: 30e0da8 a04cd36 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 16:49:18 2012 +0200 Merge remote-tracking branch 'stevee/network-fix' commit 30e0da8033bc00a6d2b767e3394207cba6633331 Merge: d3eddbc 36a77b3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 16:49:12 2012 +0200 Merge remote-tracking branch 'stevee/coreutils-8.19' commit 36a77b3a223c44565f3ff3abe3ca873e238c21b6 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Oct 27 15:20:18 2012 +0200 sysvinit: Remove utmpdump and sulogin. This binaries will be provided and maintained by util-linux 2.22. Fixes #10212. commit f54c3df3a171cef25408fe77dbcadf7b129643ee Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Sep 16 20:20:35 2012 +0200 util-linux: Update to 2.22. Now util-linux will provide the "su" command. The new util-linux also will bring the new uuid daemon. Reference #10212. Conflicts: util-linux/util-linux.nm commit effd5ec1e2b0c50f9efd9a7355098e41beac7b0a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Sep 16 18:02:21 2012 +0200 coreutils: Update to 8.19. Drop support for su, now will be provided by util-linux. Reference #10212. Conflicts: coreutils/coreutils.nm commit a04cd3604534bb37b950d3dbfb1c680e34891849 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Oct 27 16:28:03 2012 +0200 network: Add missing file for routes. The /etc/network/routes file was missing. commit d3eddbcf9510aa615dcaa4b5acabf84cee061a98 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Oct 27 16:23:39 2012 +0200 pdns-recursor: Fix config dir in systemd file. The config dir of the recursor has been changed to /etc/pdns. Without any agument, the recursor defaults to /etc/pdns-recursor as configuration directory. ----------------------------------------------------------------------- Summary of changes: coreutils/coreutils.nm | 16 +- .../coreutils-8.17-ls-rootdir-symlink.patch | 21 - coreutils/patches/coreutils-8.5-pam.patch | 422 -------------------- coreutils/patches/coreutils-8.7-runuser.patch | 338 ---------------- coreutils/patches/coreutils-i18n.patch | 226 +++++++---- .../patches/coreutils-ipfire-disabled-tests.patch | 18 +- network/network.nm | 4 +- pdns-recursor/pdns-recursor.nm | 2 +- pdns-recursor/systemd/pdns-recursor.service | 2 +- .../patches/sysvinit-2.86-remove-utils-1.patch | 10 +- sysvinit/sysvinit.nm | 4 +- {coreutils => util-linux}/pam.d/su | 0 {coreutils => util-linux}/pam.d/su-l | 0 util-linux/util-linux.nm | 78 ++++- 14 files changed, 240 insertions(+), 901 deletions(-) delete mode 100644 coreutils/patches/coreutils-8.17-ls-rootdir-symlink.patch delete mode 100644 coreutils/patches/coreutils-8.5-pam.patch delete mode 100644 coreutils/patches/coreutils-8.7-runuser.patch rename {coreutils => util-linux}/pam.d/su (100%) rename {coreutils => util-linux}/pam.d/su-l (100%) Difference in files: diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index eb0b962..6eff896 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -4,8 +4,8 @@ ############################################################################### name = coreutils -version = 8.17 -release = 2 +version = 8.19 +release = 1 groups = System/Base url = http://www.gnu.org/software/coreutils/ @@ -31,7 +31,7 @@ build libcap-devel libselinux-devel ncurses-devel - pam-devel>=1.1.5 + texinfo end CFLAGS += \ @@ -40,11 +40,10 @@ build configure_options += \ --libexecdir=%{libdir} \ - --enable-pam \ --enable-selinux \ --enable-largefile \ --disable-rpath \ - --enable-install-program=arch,su \ + --enable-install-program=arch \ --enable-no-install-program=hostname,kill,uptime \ --with-tty-group \ \ @@ -64,11 +63,6 @@ build install_cmds mkdir -pv %{BUILDROOT}%{sbindir} mv -v %{BUILDROOT}/usr/bin/chroot %{BUILDROOT}%{sbindir} - mv -v %{BUILDROOT}/usr/bin/runuser %{BUILDROOT}%{sbindir} - - # su (set right capabilities) - chmod -v u-s %{BUILDROOT}%{bindir}/su - setcap cap_setgid,cap_setuid+ep %{BUILDROOT}%{bindir}/su # Dump /etc/DIR_COLORS mkdir -pv %{BUILDROOT}%{sysconfdir} @@ -114,12 +108,10 @@ packages /bin/sleep /bin/sort /bin/stty - /bin/su /bin/sync /bin/touch /bin/true /bin/uname - /sbin/runuser end conflicts diff --git a/coreutils/pam.d/su b/coreutils/pam.d/su deleted file mode 100644 index 85e67a8..0000000 --- a/coreutils/pam.d/su +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -# Uncomment the following line to implicitly trust users in the "wheel" group. -#auth sufficient pam_wheel.so trust use_uid -# Uncomment the following line to require a user to be in the "wheel" group. -#auth required pam_wheel.so use_uid -auth include system-auth -account sufficient pam_succeed_if.so uid = 0 use_uid quiet -account include system-auth -password include system-auth -session include system-auth -session optional pam_xauth.so diff --git a/coreutils/pam.d/su-l b/coreutils/pam.d/su-l deleted file mode 100644 index 656a139..0000000 --- a/coreutils/pam.d/su-l +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth include su -account include su -password include su -session optional pam_keyinit.so force revoke -session include su diff --git a/coreutils/patches/coreutils-8.17-ls-rootdir-symlink.patch b/coreutils/patches/coreutils-8.17-ls-rootdir-symlink.patch deleted file mode 100644 index 7227afe..0000000 --- a/coreutils/patches/coreutils-8.17-ls-rootdir-symlink.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urNp coreutils-8.17-orig/src/ls.c coreutils-8.17/src/ls.c ---- coreutils-8.17-orig/src/ls.c 2012-05-11 20:59:01.467946060 +0200 -+++ coreutils-8.17/src/ls.c 2012-05-11 21:00:38.276821883 +0200 -@@ -3206,14 +3206,9 @@ make_link_name (char const *name, char const *linkname) - if (IS_ABSOLUTE_FILE_NAME (linkname)) - return xstrdup (linkname); - -- /* The link is to a relative name. Prepend any leading directory -- in 'name' to the link name. */ -- size_t prefix_len = dir_len (name); -- if (prefix_len == 0) -- return xstrdup (linkname); -- -- char *p = xmalloc (prefix_len + 1 + strlen (linkname) + 1); -- stpcpy (stpncpy (p, name, prefix_len + 1), linkname); -+ char *d = dir_name (name); -+ char *p = file_name_concat (d, linkname, NULL); -+ free (d); - return p; - } - diff --git a/coreutils/patches/coreutils-8.5-pam.patch b/coreutils/patches/coreutils-8.5-pam.patch deleted file mode 100644 index 3d0e416..0000000 --- a/coreutils/patches/coreutils-8.5-pam.patch +++ /dev/null @@ -1,422 +0,0 @@ -diff -urNp coreutils-8.16-orig/configure.ac coreutils-8.16/configure.ac ---- coreutils-8.16-orig/configure.ac 2012-03-24 19:22:13.000000000 +0100 -+++ coreutils-8.16/configure.ac 2012-03-26 17:59:07.900139497 +0200 -@@ -185,6 +185,20 @@ fi - - AC_FUNC_FORK - -+AC_ARG_ENABLE(pam, AS_HELP_STRING([--disable-pam], -+ [Disable PAM support in su (default=auto)]), , [enable_pam=yes]) -+if test "x$enable_pam" != xno; then -+ AC_CHECK_LIB([pam], [pam_start], [enable_pam=yes], [enable_pam=no]) -+ AC_CHECK_LIB([pam_misc], [misc_conv], [:], [enable_pam=no]) -+ if test "x$enable_pam" != xno; then -+ AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM]) -+ PAM_LIBS="-lpam -lpam_misc" -+ AC_SUBST(PAM_LIBS) -+ fi -+fi -+AC_MSG_CHECKING([whether to enable PAM support in su]) -+AC_MSG_RESULT([$enable_pam]) -+ - optional_bin_progs= - AC_CHECK_FUNCS([chroot], - gl_ADD_PROG([optional_bin_progs], [chroot])) -diff -urNp coreutils-8.16-orig/doc/coreutils.texi coreutils-8.16/doc/coreutils.texi ---- coreutils-8.16-orig/doc/coreutils.texi 2012-03-26 17:58:27.624763998 +0200 -+++ coreutils-8.16/doc/coreutils.texi 2012-03-26 17:59:07.907138599 +0200 -@@ -15804,7 +15804,9 @@ the exit status of @var{command} otherwi - - @command{su} allows one user to temporarily become another user. It runs a - command (often an interactive shell) with the real and effective user --ID, group ID, and supplemental groups of a given @var{user}. Synopsis: -+ID, group ID, and supplemental groups of a given @var{user}. When the -l -+option is given, the su-l PAM file is used instead of the default su PAM file. -+Synopsis: - - @example - su [@var{option}]@dots{} [@var{user} [@var{arg}]@dots{}] -@@ -15883,7 +15885,8 @@ environment variables except @env{TERM}, - (which are set, even for the super-user, as described above), and set - @env{PATH} to a compiled-in default value. Change to @var{user}'s home - directory. Prepend @samp{-} to the shell's name, intended to make it --read its login startup file(s). -+read its login startup file(s). When this option is given, /etc/pam.d/su-l -+PAM file is used instead of the default one. - - @item -m - @itemx -p -diff -urNp coreutils-8.16-orig/src/Makefile.am coreutils-8.16/src/Makefile.am ---- coreutils-8.16-orig/src/Makefile.am 2012-03-24 19:22:13.000000000 +0100 -+++ coreutils-8.16/src/Makefile.am 2012-03-26 17:59:07.928142551 +0200 -@@ -357,8 +357,8 @@ factor_LDADD += $(LIB_GMP) - # for getloadavg - uptime_LDADD += $(GETLOADAVG_LIBS) - --# for crypt --su_LDADD += $(LIB_CRYPT) -+# for crypt and pam -+su_LDADD += $(LIB_CRYPT) $(PAM_LIBS) - - # for various ACL functions - copy_LDADD += $(LIB_ACL) -diff -urNp coreutils-8.16-orig/src/su.c coreutils-8.16/src/su.c ---- coreutils-8.16-orig/src/su.c 2012-03-26 17:58:27.629764055 +0200 -+++ coreutils-8.16/src/su.c 2012-03-26 17:59:07.931138998 +0200 -@@ -37,6 +37,16 @@ - restricts who can su to UID 0 accounts. RMS considers that to - be fascist. - -+#ifdef USE_PAM -+ -+ Actually, with PAM, su has nothing to do with whether or not a -+ wheel group is enforced by su. RMS tries to restrict your access -+ to a su which implements the wheel group, but PAM considers that -+ to be fascist, and gives the user/sysadmin the opportunity to -+ enforce a wheel group by proper editing of /etc/pam.d/su -+ -+#endif -+ - Compile-time options: - -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. - -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. -@@ -52,6 +62,13 @@ - #include <sys/types.h> - #include <pwd.h> - #include <grp.h> -+#ifdef USE_PAM -+#include <security/pam_appl.h> -+#include <security/pam_misc.h> -+#include <signal.h> -+#include <sys/wait.h> -+#include <sys/fsuid.h> -+#endif - - #include "system.h" - #include "getpass.h" -@@ -120,7 +137,9 @@ - /* The user to become if none is specified. */ - #define DEFAULT_USER "root" - -+#ifndef USE_PAM - char *crypt (char const *key, char const *salt); -+#endif - - static void run_shell (char const *, char const *, char **, size_t) - ATTRIBUTE_NORETURN; -@@ -134,6 +153,11 @@ static bool simulate_login; - /* If true, change some environment vars to indicate the user su'd to. */ - static bool change_environment; - -+#ifdef USE_PAM -+static bool _pam_session_opened; -+static bool _pam_cred_established; -+#endif -+ - static struct option const longopts[] = - { - {"command", required_argument, NULL, 'c'}, -@@ -212,7 +236,174 @@ log_su (struct passwd const *pw, bool su - } - #endif - -+#ifdef USE_PAM -+#define PAM_SERVICE_NAME PROGRAM_NAME -+#define PAM_SERVICE_NAME_L PROGRAM_NAME "-l" -+static sig_atomic_t volatile caught_signal = false; -+static pam_handle_t *pamh = NULL; -+static int retval; -+static struct pam_conv conv = -+{ -+ misc_conv, -+ NULL -+}; -+ -+#define PAM_BAIL_P(a) \ -+ if (retval) \ -+ { \ -+ pam_end (pamh, retval); \ -+ a; \ -+ } -+ -+static void -+cleanup_pam (int retcode) -+{ -+ if (_pam_session_opened) -+ pam_close_session (pamh, 0); -+ -+ if (_pam_cred_established) -+ pam_setcred (pamh, PAM_DELETE_CRED | PAM_SILENT); -+ -+ pam_end(pamh, retcode); -+} -+ -+/* Signal handler for parent process. */ -+static void -+su_catch_sig (int sig) -+{ -+ caught_signal = true; -+} -+ -+/* Export env variables declared by PAM modules. */ -+static void -+export_pamenv (void) -+{ -+ char **env; -+ -+ /* This is a copy but don't care to free as we exec later anyways. */ -+ env = pam_getenvlist (pamh); -+ while (env && *env) -+ { -+ if (putenv (*env) != 0) -+ xalloc_die (); -+ env++; -+ } -+} -+ -+static void -+create_watching_parent (void) -+{ -+ pid_t child; -+ sigset_t ourset, blockset; -+ int status = 0; -+ -+ retval = pam_open_session (pamh, 0); -+ if (retval != PAM_SUCCESS) -+ { -+ cleanup_pam (retval); -+ error (EXIT_FAILURE, 0, _("cannot not open session: %s"), -+ pam_strerror (pamh, retval)); -+ } -+ else -+ _pam_session_opened = 1; -+ -+ child = fork (); -+ if (child == (pid_t) -1) -+ { -+ cleanup_pam (PAM_ABORT); -+ error (EXIT_FAILURE, errno, _("cannot create child process")); -+ } -+ -+ /* the child proceeds to run the shell */ -+ if (child == 0) -+ return; -+ -+ /* In the parent watch the child. */ -+ -+ /* su without pam support does not have a helper that keeps -+ sitting on any directory so let's go to /. */ -+ if (chdir ("/") != 0) -+ error (0, errno, _("warning: cannot change directory to %s"), "/"); -+ -+ sigfillset (&ourset); -+ if (sigprocmask (SIG_BLOCK, &ourset, NULL)) -+ { -+ error (0, errno, _("cannot block signals")); -+ caught_signal = true; -+ } -+ if (!caught_signal) -+ { -+ struct sigaction action; -+ action.sa_handler = su_catch_sig; -+ sigemptyset (&action.sa_mask); -+ action.sa_flags = 0; -+ sigemptyset (&ourset); -+ if (sigaddset (&ourset, SIGTERM) -+ || sigaddset (&ourset, SIGALRM) -+ || sigaction (SIGTERM, &action, NULL) -+ || sigprocmask (SIG_UNBLOCK, &ourset, NULL)) -+ { -+ error (0, errno, _("cannot set signal handler")); -+ caught_signal = true; -+ } -+ } -+ if (!caught_signal) -+ { -+ pid_t pid; -+ for (;;) -+ { -+ pid = waitpid (child, &status, WUNTRACED); -+ -+ if (pid != (pid_t)-1 && WIFSTOPPED (status)) -+ { -+ /* tcsh sends SIGTSTP to the process group, and so is already pending */ -+ kill (getpid (), SIGSTOP); -+ if (WSTOPSIG(status) != SIGSTOP) { -+ sigemptyset(&blockset); -+ if (sigaddset(&blockset, WSTOPSIG(status)) || -+ sigprocmask(SIG_UNBLOCK, &blockset, &ourset) || -+ sigprocmask(SIG_SETMASK, &ourset, NULL)) -+ { -+ error (0, errno, _("cannot set signal handler")); -+ } -+ } -+ /* once we get here, we must have resumed */ -+ kill (pid, SIGCONT); -+ } -+ else -+ break; -+ } -+ if (pid != (pid_t)-1) -+ if (WIFSIGNALED (status)) -+ status = WTERMSIG (status) + 128; -+ else -+ status = WEXITSTATUS (status); -+ else -+ status = 1; -+ } -+ else -+ status = 1; -+ -+ if (caught_signal) -+ { -+ fprintf (stderr, _("\nSession terminated, killing shell...")); -+ kill (child, SIGTERM); -+ } -+ -+ cleanup_pam (PAM_SUCCESS); -+ -+ if (caught_signal) -+ { -+ sleep (2); -+ kill (child, SIGKILL); -+ fprintf (stderr, _(" ...killed.\n")); -+ } -+ exit (status); -+} -+#endif -+ - /* Ask the user for a password. -+ If PAM is in use, let PAM ask for the password if necessary. - Return true if the user gives the correct password for entry PW, - false if not. Return true without asking for a password if run by UID 0 - or if PW has an empty password. */ -@@ -220,10 +411,52 @@ log_su (struct passwd const *pw, bool su - static bool - correct_password (const struct passwd *pw) - { -+#ifdef USE_PAM -+ const struct passwd *lpw; -+ const char *cp; -+ -+ retval = pam_start (simulate_login ? PAM_SERVICE_NAME_L : PAM_SERVICE_NAME, -+ pw->pw_name, &conv, &pamh); -+ PAM_BAIL_P (return false); -+ -+ if (isatty (0) && (cp = ttyname (0)) != NULL) -+ { -+ const char *tty; -+ -+ if (strncmp (cp, "/dev/", 5) == 0) -+ tty = cp + 5; -+ else -+ tty = cp; -+ retval = pam_set_item (pamh, PAM_TTY, tty); -+ PAM_BAIL_P (return false); -+ } -+#if 0 /* Manpage discourages use of getlogin. */ -+ cp = getlogin (); -+ if (!(cp && *cp && (lpw = getpwnam (cp)) != NULL && lpw->pw_uid == getuid ())) -+#endif -+ lpw = getpwuid (getuid ()); -+ if (lpw && lpw->pw_name) -+ { -+ retval = pam_set_item (pamh, PAM_RUSER, (const void *) lpw->pw_name); -+ PAM_BAIL_P (return false); -+ } -+ retval = pam_authenticate (pamh, 0); -+ PAM_BAIL_P (return false); -+ retval = pam_acct_mgmt (pamh, 0); -+ if (retval == PAM_NEW_AUTHTOK_REQD) -+ { -+ /* Password has expired. Offer option to change it. */ -+ retval = pam_chauthtok (pamh, PAM_CHANGE_EXPIRED_AUTHTOK); -+ PAM_BAIL_P (return false); -+ } -+ PAM_BAIL_P (return false); -+ /* Must be authenticated if this point was reached. */ -+ return true; -+#else /* !USE_PAM */ - char *unencrypted, *encrypted, *correct; - #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP - /* Shadow passwd stuff for SVR3 and maybe other systems. */ -- struct spwd *sp = getspnam (pw->pw_name); -+ const struct spwd *sp = getspnam (pw->pw_name); - - endspent (); - if (sp) -@@ -244,6 +477,7 @@ correct_password (const struct passwd *p - encrypted = crypt (unencrypted, correct); - memset (unencrypted, 0, strlen (unencrypted)); - return STREQ (encrypted, correct); -+#endif /* !USE_PAM */ - } - - /* Update 'environ' for the new shell based on PW, with SHELL being -@@ -286,19 +520,41 @@ modify_environment (const struct passwd - } - } - } -+ -+#ifdef USE_PAM -+ export_pamenv (); -+#endif - } - - /* Become the user and group(s) specified by PW. */ - - static void --change_identity (const struct passwd *pw) -+init_groups (const struct passwd *pw) - { - #ifdef HAVE_INITGROUPS - errno = 0; - if (initgroups (pw->pw_name, pw->pw_gid) == -1) -- error (EXIT_CANCELED, errno, _("cannot set groups")); -+ { -+#ifdef USE_PAM -+ cleanup_pam (PAM_ABORT); -+#endif -+ error (EXIT_FAILURE, errno, _("cannot set groups")); -+ } - endgrent (); - #endif -+ -+#ifdef USE_PAM -+ retval = pam_setcred (pamh, PAM_ESTABLISH_CRED); -+ if (retval != PAM_SUCCESS) -+ error (EXIT_FAILURE, 0, "%s", pam_strerror (pamh, retval)); -+ else -+ _pam_cred_established = 1; -+#endif -+} -+ -+static void -+change_identity (const struct passwd *pw) -+{ - if (setgid (pw->pw_gid)) - error (EXIT_CANCELED, errno, _("cannot set group id")); - if (setuid (pw->pw_uid)) -@@ -511,9 +767,21 @@ main (int argc, char **argv) - shell = NULL; - } - shell = xstrdup (shell ? shell : pw->pw_shell); -- modify_environment (pw, shell); -+ -+ init_groups (pw); -+ -+#ifdef USE_PAM -+ create_watching_parent (); -+ /* Now we're in the child. */ -+#endif - - change_identity (pw); -+ -+ /* Set environment after pam_open_session, which may put KRB5CCNAME -+ into the pam_env, etc. */ -+ -+ modify_environment (pw, shell); -+ - if (simulate_login && chdir (pw->pw_dir) != 0) - error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); - diff --git a/coreutils/patches/coreutils-8.7-runuser.patch b/coreutils/patches/coreutils-8.7-runuser.patch deleted file mode 100644 index 533e15a..0000000 --- a/coreutils/patches/coreutils-8.7-runuser.patch +++ /dev/null @@ -1,338 +0,0 @@ -diff -urNp coreutils-8.7-orig/AUTHORS coreutils-8.7/AUTHORS ---- coreutils-8.7-orig/AUTHORS 2010-10-11 19:35:11.000000000 +0200 -+++ coreutils-8.7/AUTHORS 2010-11-15 10:08:04.222078001 +0100 -@@ -65,6 +65,7 @@ readlink: Dmitry V. Levin - rm: Paul Rubin, David MacKenzie, Richard M. Stallman, Jim Meyering - rmdir: David MacKenzie - runcon: Russell Coker -+runuser: David MacKenzie, Dan Walsh - seq: Ulrich Drepper - sha1sum: Ulrich Drepper, Scott Miller, David Madore - sha224sum: Ulrich Drepper, Scott Miller, David Madore -diff -urNp coreutils-8.7-orig/man/help2man coreutils-8.7/man/help2man ---- coreutils-8.7-orig/man/help2man 2010-10-11 19:35:11.000000000 +0200 -+++ coreutils-8.7/man/help2man 2010-11-15 10:08:51.331054884 +0100 -@@ -555,6 +555,9 @@ while (length) - $include{$sect} .= $content; - } - -+# There is no info documentation for runuser (shared with su). -+$opt_no_info = 1 if $program eq 'runuser'; -+ - # Refer to the real documentation. - unless ($opt_no_info) - { -diff -urNp coreutils-8.7-orig/man/Makefile.am coreutils-8.7/man/Makefile.am ---- coreutils-8.7-orig/man/Makefile.am 2010-10-11 19:35:11.000000000 +0200 -+++ coreutils-8.7/man/Makefile.am 2010-11-15 10:09:21.768922182 +0100 -@@ -94,6 +94,7 @@ readlink.1: $(common_dep) $(srcdir)/read - rm.1: $(common_dep) $(srcdir)/rm.x ../src/rm.c - rmdir.1: $(common_dep) $(srcdir)/rmdir.x ../src/rmdir.c - runcon.1: $(common_dep) $(srcdir)/runcon.x ../src/runcon.c -+runuser.1: $(common_dep) $(srcdir)/runuser.x ../src/su.c - seq.1: $(common_dep) $(srcdir)/seq.x ../src/seq.c - sha1sum.1: $(common_dep) $(srcdir)/sha1sum.x ../src/md5sum.c - sha224sum.1: $(common_dep) $(srcdir)/sha224sum.x ../src/md5sum.c -diff -urNp coreutils-8.7-orig/man/runuser.x coreutils-8.7/man/runuser.x ---- coreutils-8.7-orig/man/runuser.x 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.7/man/runuser.x 2010-11-15 10:09:57.437939015 +0100 -@@ -0,0 +1,12 @@ -+[NAME] -+runuser \- run a shell with substitute user and group IDs -+[DESCRIPTION] -+.\" Add any additional description here -+[SEE ALSO] -+.TP -+More detailed Texinfo documentation could be found by command -+.TP -+\t\fBinfo coreutils \(aqsu invocation\(aq\fR\t -+.TP -+since the command \fBrunuser\fR is trimmed down version of command \fBsu\fR. -+.br -diff -urNp coreutils-8.7-orig/README coreutils-8.7/README ---- coreutils-8.7-orig/README 2010-10-11 19:35:11.000000000 +0200 -+++ coreutils-8.7/README 2010-11-15 10:10:43.002922253 +0100 -@@ -11,8 +11,8 @@ The programs that can be built with this - factor false fmt fold groups head hostid hostname id install join kill - link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup - nproc od paste pathchk pinky pr printenv printf ptx pwd readlink realpath -- rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred -- shuf sleep sort split stat stdbuf stty su sum sync tac tail tee test -+ rm rmdir runcon runuser seq sha1sum sha224sum sha256sum sha384sum sha512sum -+ shred shuf sleep sort split stat stdbuf stty su sum sync tac tail tee test - timeout touch tr true truncate tsort tty uname unexpand uniq unlink - uptime users vdir wc who whoami yes - -diff -urNp coreutils-8.7-orig/src/Makefile.am coreutils-8.7/src/Makefile.am ---- coreutils-8.7-orig/src/Makefile.am 2010-11-15 10:07:07.339171659 +0100 -+++ coreutils-8.7/src/Makefile.am 2010-11-15 10:12:14.847094550 +0100 -@@ -100,6 +100,7 @@ EXTRA_PROGRAMS = \ - rm \ - rmdir \ - runcon \ -+ runuser \ - seq \ - sha1sum \ - sha224sum \ -@@ -300,6 +301,10 @@ cp_LDADD += $(copy_LDADD) - ginstall_LDADD += $(copy_LDADD) - mv_LDADD += $(copy_LDADD) - -+runuser_SOURCES = su.c -+runuser_CFLAGS = -DRUNUSER -DAUTHORS="\"David MacKenzie, Dan Walsh\"" -+runuser_LDADD = $(LDADD) $(LIB_CRYPT) $(PAM_LIBS) -+ - remove_LDADD = - mv_LDADD += $(remove_LDADD) - rm_LDADD += $(remove_LDADD) -@@ -395,7 +400,7 @@ RELEASE_YEAR = \ - `sed -n '/.*COPYRIGHT_YEAR = $[0-9][0-9][0-9][0-9]$ };/s//\1/p' \ - $(top_srcdir)/lib/version-etc.c` - --all-local: su$(EXEEXT) -+all-local: su$(EXEEXT) runuser - - installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'` - -diff -urNp coreutils-8.7-orig/src/su.c coreutils-8.7/src/su.c ---- coreutils-8.7-orig/src/su.c 2010-11-15 10:07:07.372933288 +0100 -+++ coreutils-8.7/src/su.c 2010-11-15 10:42:12.569159230 +0100 -@@ -100,9 +100,15 @@ - #include "error.h" - - /* The official name of this program (e.g., no 'g' prefix). */ -+#ifndef RUNUSER - #define PROGRAM_NAME "su" -+#else -+#define PROGRAM_NAME "runuser" -+#endif - -+#ifndef AUTHORS - #define AUTHORS proper_name ("David MacKenzie") -+#endif - - #if HAVE_PATHS_H - # include <paths.h> -@@ -140,6 +146,9 @@ - #ifndef USE_PAM - char *crypt (char const *key, char const *salt); - #endif -+#ifndef CHECKPASSWD -+#define CHECKPASSWD 1 -+#endif - - static void run_shell (char const *, char const *, char **, size_t) - ATTRIBUTE_NORETURN; -@@ -169,6 +178,10 @@ static struct option const longopts[] = - {"login", no_argument, NULL, 'l'}, - {"preserve-environment", no_argument, NULL, 'p'}, - {"shell", required_argument, NULL, 's'}, -+#ifdef RUNUSER -+ {"group", required_argument, NULL, 'g'}, -+ {"supp-group", required_argument, NULL, 'G'}, -+#endif - {GETOPT_HELP_OPTION_DECL}, - {GETOPT_VERSION_OPTION_DECL}, - {NULL, 0, NULL, 0} -@@ -444,6 +457,11 @@ correct_password (const struct passwd *p - retval = pam_set_item (pamh, PAM_RUSER, (const void *) lpw->pw_name); - PAM_BAIL_P (return false); - } -+#ifdef RUNUSER -+ if (getuid() != geteuid()) -+ /* safety net: deny operation if we are suid by accident */ -+ error(EXIT_FAILURE, 1, "runuser may not be setuid"); -+#else - retval = pam_authenticate (pamh, 0); - PAM_BAIL_P (return false); - retval = pam_acct_mgmt (pamh, 0); -@@ -454,6 +472,7 @@ correct_password (const struct passwd *p - PAM_BAIL_P (return false); - } - PAM_BAIL_P (return false); -+#endif - /* Must be authenticated if this point was reached. */ - return true; - #else /* !USE_PAM */ -@@ -533,11 +552,22 @@ modify_environment (const struct passwd - /* Become the user and group(s) specified by PW. */ - - static void --init_groups (const struct passwd *pw) -+init_groups (const struct passwd *pw -+#ifdef RUNUSER -+ , gid_t *groups, int num_groups -+#endif -+ ) - { - #ifdef HAVE_INITGROUPS -+ int rc = 0; - errno = 0; -- if (initgroups (pw->pw_name, pw->pw_gid) == -1) -+#ifdef RUNUSER -+ if (num_groups) -+ rc = setgroups(num_groups, groups); -+ else -+#endif -+ rc = initgroups(pw->pw_name, pw->pw_gid); -+ if (rc == -1) - { - #ifdef USE_PAM - cleanup_pam (PAM_ABORT); -@@ -639,6 +669,28 @@ usage (int status) - else - { - printf (_("Usage: %s [OPTION]... [-] [USER [ARG]...]\n"), program_name); -+#ifdef RUNUSER -+ printf (_("\ -+Change the effective user id and group id to that of USER. Only session PAM\n\ -+hooks are run, and there is no password prompt. This command is useful only\n\ -+when run as the root user. If run as a non-root user without privilege\n\ -+to set user ID, the command will fail as the binary is not setuid.\n\ -+As %s doesn't run auth and account PAM hooks, it runs with lower overhead\n\ -+than su.\n\ -+\n\ -+ -, -l, --login make the shell a login shell, uses runuser-l\n\ -+ PAM file instead of default one\n\ -+ -g --group=group specify the primary group\n\ -+ -G --supp-group=group specify a supplemental group\n\ -+ -c, --command=COMMAND pass a single COMMAND to the shell with -c\n\ -+ --session-command=COMMAND pass a single COMMAND to the shell with -c\n\ -+ and do not create a new session\n\ -+ -f, --fast pass -f to the shell (for csh or tcsh)\n\ -+ -m, --preserve-environment do not reset environment variables\n\ -+ -p same as -m\n\ -+ -s, --shell=SHELL run SHELL if /etc/shells allows it\n\ -+"), program_name); -+#else - fputs (_("\ - Change the effective user id and group id to that of USER.\n\ - \n\ -@@ -651,6 +703,7 @@ Change the effective user id and group i - -p same as -m\n\ - -s, --shell=SHELL run SHELL if /etc/shells allows it\n\ - "), stdout); -+#endif - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); - fputs (_("\ -@@ -672,6 +725,12 @@ main (int argc, char **argv) - char *shell = NULL; - struct passwd *pw; - struct passwd pw_copy; -+#ifdef RUNUSER -+ struct group *gr; -+ gid_t groups[NGROUPS_MAX]; -+ int num_supp_groups = 0; -+ int use_gid = 0; -+#endif - - initialize_main (&argc, &argv); - set_program_name (argv[0]); -@@ -686,7 +745,11 @@ main (int argc, char **argv) - simulate_login = false; - change_environment = true; - -- while ((optc = getopt_long (argc, argv, "c:flmps:", longopts, NULL)) != -1) -+ while ((optc = getopt_long (argc, argv, "c:flmps:" -+#ifdef RUNUSER -+ "g:G:" -+#endif -+ , longopts, NULL)) != -1) - { - switch (optc) - { -@@ -716,6 +779,28 @@ main (int argc, char **argv) - shell = optarg; - break; - -+#ifdef RUNUSER -+ case 'g': -+ gr = getgrnam(optarg); -+ if (!gr) -+ error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg); -+ use_gid = 1; -+ groups[0] = gr->gr_gid; -+ break; -+ -+ case 'G': -+ num_supp_groups++; -+ if (num_supp_groups >= NGROUPS_MAX) -+ error (EXIT_FAILURE, 0, -+ _("Can't specify more than %d supplemental groups"), -+ NGROUPS_MAX - 1); -+ gr = getgrnam(optarg); -+ if (!gr) -+ error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg); -+ groups[num_supp_groups] = gr->gr_gid; -+ break; -+#endif -+ - case_GETOPT_HELP_CHAR; - - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); -@@ -754,7 +839,20 @@ main (int argc, char **argv) - : DEFAULT_SHELL); - endpwent (); - -- if (!correct_password (pw)) -+#ifdef RUNUSER -+ if (num_supp_groups && !use_gid) -+ { -+ pw->pw_gid = groups[1]; -+ memmove (groups, groups + 1, sizeof(gid_t) * num_supp_groups); -+ } -+ else if (use_gid) -+ { -+ pw->pw_gid = groups[0]; -+ num_supp_groups++; -+ } -+#endif -+ -+ if (CHECKPASSWD && !correct_password (pw)) - { - #ifdef SYSLOG_FAILURE - log_su (pw, false); -@@ -784,7 +882,11 @@ main (int argc, char **argv) - } - shell = xstrdup (shell ? shell : pw->pw_shell); - -- init_groups (pw); -+ init_groups (pw -+#ifdef RUNUSER -+ , groups, num_supp_groups -+#endif -+ ); - - #ifdef USE_PAM - create_watching_parent (); -diff -urNp coreutils-8.7-orig/tests/misc/help-version coreutils-8.7/tests/misc/help-version ---- coreutils-8.7-orig/tests/misc/help-version 2010-10-11 19:35:11.000000000 +0200 -+++ coreutils-8.7/tests/misc/help-version 2010-11-15 10:45:18.473682325 +0100 -@@ -32,6 +32,7 @@ expected_failure_status_nohup=125 - expected_failure_status_stdbuf=125 - expected_failure_status_su=125 - expected_failure_status_timeout=125 -+expected_failure_status_runuser=125 - expected_failure_status_printenv=2 - expected_failure_status_tty=3 - expected_failure_status_sort=2 -@@ -209,6 +210,7 @@ seq_setup () { args=10; } - sleep_setup () { args=0; } - su_setup () { args=--version; } - stdbuf_setup () { args="-oL true"; } -+runuser_setup () { args=--version; } - timeout_setup () { args=--version; } - - # I'd rather not run sync, since it spins up disks that I've -diff -urNp coreutils-8.7-orig/tests/misc/invalid-opt coreutils-8.7/tests/misc/invalid-opt ---- coreutils-8.7-orig/tests/misc/invalid-opt 2010-10-11 19:35:11.000000000 +0200 -+++ coreutils-8.7/tests/misc/invalid-opt 2010-11-15 10:45:46.451938873 +0100 -@@ -37,6 +37,7 @@ my %exit_status = - sort => 2, - stdbuf => 125, - su => 125, -+ runuser => 125, - test => 0, - timeout => 125, - true => 0, diff --git a/coreutils/patches/coreutils-i18n.patch b/coreutils/patches/coreutils-i18n.patch index 5b0d3b8..a5b9aaf 100644 --- a/coreutils/patches/coreutils-i18n.patch +++ b/coreutils/patches/coreutils-i18n.patch @@ -1,6 +1,6 @@ -diff -urNp coreutils-8.16-orig/lib/linebuffer.h coreutils-8.16/lib/linebuffer.h ---- coreutils-8.16-orig/lib/linebuffer.h 2012-01-06 10:14:31.000000000 +0100 -+++ coreutils-8.16/lib/linebuffer.h 2012-03-26 18:02:00.993889446 +0200 +diff -urNp coreutils-8.19-orig/lib/linebuffer.h coreutils-8.19/lib/linebuffer.h +--- coreutils-8.19-orig/lib/linebuffer.h 2012-01-06 10:14:31.000000000 +0100 ++++ coreutils-8.19/lib/linebuffer.h 2012-08-20 13:52:04.061593006 +0200 @@ -21,6 +21,11 @@ # include <stdio.h> @@ -23,9 +23,9 @@ diff -urNp coreutils-8.16-orig/lib/linebuffer.h coreutils-8.16/lib/linebuffer.h }; /* Initialize linebuffer LINEBUFFER for use. */ -diff -urNp coreutils-8.16-orig/src/cut.c coreutils-8.16/src/cut.c ---- coreutils-8.16-orig/src/cut.c 2012-03-24 21:26:51.000000000 +0100 -+++ coreutils-8.16/src/cut.c 2012-03-26 17:46:48.000000000 +0200 +diff -urNp coreutils-8.19-orig/src/cut.c coreutils-8.19/src/cut.c +--- coreutils-8.19-orig/src/cut.c 2012-07-21 16:54:31.000000000 +0200 ++++ coreutils-8.19/src/cut.c 2012-08-20 13:52:52.299593173 +0200 @@ -28,6 +28,11 @@ #include <assert.h> #include <getopt.h> @@ -376,7 +376,7 @@ diff -urNp coreutils-8.16-orig/src/cut.c coreutils-8.16/src/cut.c + break; + } + -+ if (wc == WEOF) ++ if (len <= 0 && wc == WEOF) + break; + + /* If the first field extends to the end of line (it is not @@ -633,9 +633,9 @@ diff -urNp coreutils-8.16-orig/src/cut.c coreutils-8.16/src/cut.c } if (optind == argc) -diff -urNp coreutils-8.16-orig/src/expand.c coreutils-8.16/src/expand.c ---- coreutils-8.16-orig/src/expand.c 2012-03-24 21:26:51.000000000 +0100 -+++ coreutils-8.16/src/expand.c 2012-03-26 17:42:56.000000000 +0200 +diff -urNp coreutils-8.19-orig/src/expand.c coreutils-8.19/src/expand.c +--- coreutils-8.19-orig/src/expand.c 2012-07-21 16:54:31.000000000 +0200 ++++ coreutils-8.19/src/expand.c 2012-08-20 13:54:02.974621693 +0200 @@ -37,12 +37,29 @@ #include <stdio.h> #include <getopt.h> @@ -733,7 +733,7 @@ diff -urNp coreutils-8.16-orig/src/expand.c coreutils-8.16/src/expand.c + if (convert) + { + ++column; -+ if (convert_entire_line == 0) ++ if (convert_entire_line == 0 && !isblank(*bufpos)) + convert = 0; + } + putchar (*bufpos); @@ -793,7 +793,7 @@ diff -urNp coreutils-8.16-orig/src/expand.c coreutils-8.16/src/expand.c + + width = wcwidth (wc); + column += (width > 0) ? width : 0; -+ if (convert_entire_line == 0) ++ if (convert_entire_line == 0 && !iswblank(wc)) + convert = 0; + } + } @@ -823,9 +823,9 @@ diff -urNp coreutils-8.16-orig/src/expand.c coreutils-8.16/src/expand.c if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); -diff -urNp coreutils-8.16-orig/src/fold.c coreutils-8.16/src/fold.c ---- coreutils-8.16-orig/src/fold.c 2012-03-24 19:22:13.000000000 +0100 -+++ coreutils-8.16/src/fold.c 2012-03-26 17:48:37.000000000 +0200 +diff -urNp coreutils-8.19-orig/src/fold.c coreutils-8.19/src/fold.c +--- coreutils-8.19-orig/src/fold.c 2012-07-21 16:54:31.000000000 +0200 ++++ coreutils-8.19/src/fold.c 2012-08-20 13:52:04.066592980 +0200 @@ -22,12 +22,34 @@ #include <getopt.h> #include <sys/types.h> @@ -1223,9 +1223,9 @@ diff -urNp coreutils-8.16-orig/src/fold.c coreutils-8.16/src/fold.c break; case 's': /* Break at word boundaries. */ -diff -urNp coreutils-8.16-orig/src/join.c coreutils-8.16/src/join.c ---- coreutils-8.16-orig/src/join.c 2012-03-24 21:26:51.000000000 +0100 -+++ coreutils-8.16/src/join.c 2012-03-26 17:50:02.000000000 +0200 +diff -urNp coreutils-8.19-orig/src/join.c coreutils-8.19/src/join.c +--- coreutils-8.19-orig/src/join.c 2012-07-21 16:54:31.000000000 +0200 ++++ coreutils-8.19/src/join.c 2012-08-20 13:52:04.069594876 +0200 @@ -22,18 +22,32 @@ #include <sys/types.h> #include <getopt.h> @@ -1701,9 +1701,9 @@ diff -urNp coreutils-8.16-orig/src/join.c coreutils-8.16/src/join.c break; case NOCHECK_ORDER_OPTION: -diff -urNp coreutils-8.16-orig/src/pr.c coreutils-8.16/src/pr.c ---- coreutils-8.16-orig/src/pr.c 2012-03-24 21:26:51.000000000 +0100 -+++ coreutils-8.16/src/pr.c 2012-03-26 17:50:48.000000000 +0200 +diff -urNp coreutils-8.19-orig/src/pr.c coreutils-8.19/src/pr.c +--- coreutils-8.19-orig/src/pr.c 2012-07-21 16:54:31.000000000 +0200 ++++ coreutils-8.19/src/pr.c 2012-08-20 13:52:04.074593445 +0200 @@ -312,6 +312,32 @@ #include <getopt.h> @@ -2447,20 +2447,13 @@ diff -urNp coreutils-8.16-orig/src/pr.c coreutils-8.16/src/pr.c /* We've just printed some files and need to clean up things before looking for more options and printing the next batch of files. -diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c ---- coreutils-8.17-orig/src/sort.c -+++ coreutils-8.17/src/sort.c -@@ -22,12 +22,21 @@ - - #include <config.h> - -+#include <assert.h> - #include <getopt.h> - #include <pthread.h> - #include <sys/resource.h> - #include <sys/types.h> +diff -urNp coreutils-8.19-orig/src/sort.c coreutils-8.19/src/sort.c +--- coreutils-8.19-orig/src/sort.c 2012-08-18 07:39:29.000000000 +0200 ++++ coreutils-8.19/src/sort.c 2012-08-20 13:52:04.079596072 +0200 +@@ -29,6 +29,14 @@ #include <sys/wait.h> #include <signal.h> + #include <assert.h> +#if HAVE_WCHAR_H +# include <wchar.h> +#endif @@ -2472,7 +2465,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c #include "system.h" #include "argmatch.h" #include "error.h" -@@ -167,12 +176,34 @@ static int thousands_sep; +@@ -166,12 +174,34 @@ static int thousands_sep; /* Nonzero if the corresponding locales are hard. */ static bool hard_LC_COLLATE; @@ -2508,7 +2501,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c /* The kind of blanks for '-b' to skip in various options. */ enum blanktype { bl_start, bl_end, bl_both }; -@@ -343,13 +374,11 @@ static bool reverse; +@@ -345,13 +375,11 @@ static bool reverse; they were read if all keys compare equal. */ static bool stable; @@ -2525,7 +2518,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c /* Flag to remove consecutive duplicate lines from the output. Only the last of a sequence of equal lines will be output. */ -@@ -782,6 +811,46 @@ reap_all (void) +@@ -784,6 +812,46 @@ reap_all (void) reap (-1); } @@ -2572,7 +2565,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c /* Clean up any remaining temporary files. */ static void -@@ -1214,7 +1283,7 @@ zaptemp (char const *name) +@@ -1224,7 +1292,7 @@ zaptemp (char const *name) free (node); } @@ -2581,7 +2574,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c static int struct_month_cmp (void const *m1, void const *m2) -@@ -1229,7 +1298,7 @@ struct_month_cmp (void const *m1, void c +@@ -1239,7 +1307,7 @@ struct_month_cmp (void const *m1, void c /* Initialize the character class tables. */ static void @@ -2590,7 +2583,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c { size_t i; -@@ -1241,7 +1310,7 @@ inittables (void) +@@ -1251,7 +1319,7 @@ inittables (void) fold_toupper[i] = toupper (i); } @@ -2599,7 +2592,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c /* If we're not in the "C" locale, read different names for months. */ if (hard_LC_TIME) { -@@ -1323,6 +1392,84 @@ specify_nmerge (int oi, char c, char con +@@ -1333,6 +1401,84 @@ specify_nmerge (int oi, char c, char con xstrtol_fatal (e, oi, c, long_options, s); } @@ -2684,7 +2677,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c /* Specify the amount of main memory to use when sorting. */ static void specify_sort_size (int oi, char c, char const *s) -@@ -1551,7 +1698,7 @@ buffer_linelim (struct buffer const *buf +@@ -1565,7 +1711,7 @@ buffer_linelim (struct buffer const *buf by KEY in LINE. */ static char * @@ -2693,7 +2686,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c { char *ptr = line->text, *lim = ptr + line->length - 1; size_t sword = key->sword; -@@ -1560,10 +1707,10 @@ begfield (struct line const *line, struc +@@ -1574,10 +1720,10 @@ begfield (struct line const *line, struc /* The leading field separator itself is included in a field when -t is absent. */ @@ -2706,7 +2699,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c ++ptr; if (ptr < lim) ++ptr; -@@ -1589,11 +1736,70 @@ begfield (struct line const *line, struc +@@ -1603,11 +1749,70 @@ begfield (struct line const *line, struc return ptr; } @@ -2778,7 +2771,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c { char *ptr = line->text, *lim = ptr + line->length - 1; size_t eword = key->eword, echar = key->echar; -@@ -1608,10 +1814,10 @@ limfield (struct line const *line, struc +@@ -1622,10 +1827,10 @@ limfield (struct line const *line, struc 'beginning' is the first character following the delimiting TAB. Otherwise, leave PTR pointing at the first 'blank' character after the preceding field. */ @@ -2791,7 +2784,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c ++ptr; if (ptr < lim && (eword || echar)) ++ptr; -@@ -1657,10 +1863,10 @@ limfield (struct line const *line, struc +@@ -1671,10 +1876,10 @@ limfield (struct line const *line, struc */ /* Make LIM point to the end of (one byte past) the current field. */ @@ -2804,7 +2797,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c if (newlim) lim = newlim; } -@@ -1691,6 +1897,130 @@ limfield (struct line const *line, struc +@@ -1705,6 +1910,130 @@ limfield (struct line const *line, struc return ptr; } @@ -2935,7 +2928,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c /* Fill BUF reading from FP, moving buf->left bytes from the end of buf->buf to the beginning first. If EOF is reached and the file wasn't terminated by a newline, supply one. Set up BUF's line -@@ -1777,8 +2107,22 @@ fillbuf (struct buffer *buf, FILE *fp, c +@@ -1791,8 +2120,22 @@ fillbuf (struct buffer *buf, FILE *fp, c else { if (key->skipsblanks) @@ -2960,7 +2953,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c line->keybeg = line_start; } } -@@ -1899,7 +2243,7 @@ human_numcompare (char const *a, char co +@@ -1913,7 +2256,7 @@ human_numcompare (char const *a, char co hideously fast. */ static int @@ -2969,7 +2962,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c { while (blanks[to_uchar (*a)]) a++; -@@ -1909,6 +2253,25 @@ numcompare (char const *a, char const *b +@@ -1923,6 +2266,25 @@ numcompare (char const *a, char const *b return strnumcmp (a, b, decimal_point, thousands_sep); } @@ -2995,7 +2988,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c /* Work around a problem whereby the long double value returned by glibc's strtold ("NaN", ...) contains uninitialized bits: clear all bytes of A and B before calling strtold. FIXME: remove this function once -@@ -1959,7 +2322,7 @@ general_numcompare (char const *sa, char +@@ -1973,7 +2335,7 @@ general_numcompare (char const *sa, char Return 0 if the name in S is not recognized. */ static int @@ -3004,7 +2997,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c { size_t lo = 0; size_t hi = MONTHS_PER_YEAR; -@@ -2234,15 +2597,14 @@ debug_key (struct line const *line, stru +@@ -2248,15 +2610,14 @@ debug_key (struct line const *line, stru char saved = *lim; *lim = '\0'; @@ -3022,7 +3015,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c else if (key->general_numeric) ignore_value (strtold (beg, &tighter_lim)); else if (key->numeric || key->human_numeric) -@@ -2386,7 +2748,7 @@ key_warnings (struct keyfield const *gke +@@ -2400,7 +2761,7 @@ key_warnings (struct keyfield const *gke bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare (key) && !(key->schar || key->echar); bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */ @@ -3031,7 +3024,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c && ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned)) || (!key->skipsblanks && key->schar) || (!key->skipeblanks && key->echar))) -@@ -2444,11 +2806,83 @@ key_warnings (struct keyfield const *gke +@@ -2458,11 +2819,83 @@ key_warnings (struct keyfield const *gke error (0, 0, _("option '-r' only applies to last-resort comparison")); } @@ -3116,7 +3109,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c { struct keyfield *key = keylist; -@@ -2533,7 +2967,7 @@ keycompare (struct line const *a, struct +@@ -2547,7 +2980,7 @@ keycompare (struct line const *a, struct else if (key->human_numeric) diff = human_numcompare (ta, tb); else if (key->month) @@ -3125,7 +3118,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c else if (key->random) diff = compare_random (ta, tlena, tb, tlenb); else if (key->version) -@@ -2649,6 +3083,180 @@ keycompare (struct line const *a, struct +@@ -2663,6 +3096,180 @@ keycompare (struct line const *a, struct return key->reverse ? -diff : diff; } @@ -3306,7 +3299,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c /* Compare two lines A and B, returning negative, zero, or positive depending on whether A compares less than, equal to, or greater than B. */ -@@ -4109,7 +4717,7 @@ main (int argc, char **argv) +@@ -4158,7 +4765,7 @@ main (int argc, char **argv) initialize_exit_failure (SORT_FAILURE); hard_LC_COLLATE = hard_locale (LC_COLLATE); @@ -3315,7 +3308,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c hard_LC_TIME = hard_locale (LC_TIME); #endif -@@ -4130,6 +4738,29 @@ main (int argc, char **argv) +@@ -4179,6 +4786,29 @@ main (int argc, char **argv) thousands_sep = -1; } @@ -3345,7 +3338,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c have_read_stdin = false; inittables (); -@@ -4400,13 +5031,34 @@ main (int argc, char **argv) +@@ -4453,13 +5083,34 @@ main (int argc, char **argv) case 't': { @@ -3384,7 +3377,7 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c else { /* Provoke with 'sort -txx'. Complain about -@@ -4417,9 +5069,12 @@ main (int argc, char **argv) +@@ -4470,9 +5121,12 @@ main (int argc, char **argv) quote (optarg)); } } @@ -3399,9 +3392,9 @@ diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c } break; -diff -urNp coreutils-8.16-orig/src/unexpand.c coreutils-8.16/src/unexpand.c ---- coreutils-8.16-orig/src/unexpand.c 2012-03-24 21:26:51.000000000 +0100 -+++ coreutils-8.16/src/unexpand.c 2012-03-26 17:51:46.000000000 +0200 +diff -urNp coreutils-8.19-orig/src/unexpand.c coreutils-8.19/src/unexpand.c +--- coreutils-8.19-orig/src/unexpand.c 2012-07-21 16:54:31.000000000 +0200 ++++ coreutils-8.19/src/unexpand.c 2012-08-20 13:52:04.081596774 +0200 @@ -38,12 +38,29 @@ #include <stdio.h> #include <getopt.h> @@ -3655,9 +3648,9 @@ diff -urNp coreutils-8.16-orig/src/unexpand.c coreutils-8.16/src/unexpand.c if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); -diff -urNp coreutils-8.16-orig/src/uniq.c coreutils-8.16/src/uniq.c ---- coreutils-8.16-orig/src/uniq.c 2012-03-24 21:26:51.000000000 +0100 -+++ coreutils-8.16/src/uniq.c 2012-03-26 17:35:09.000000000 +0200 +diff -urNp coreutils-8.19-orig/src/uniq.c coreutils-8.19/src/uniq.c +--- coreutils-8.19-orig/src/uniq.c 2012-07-21 16:54:31.000000000 +0200 ++++ coreutils-8.19/src/uniq.c 2012-08-20 13:52:04.083502506 +0200 @@ -21,6 +21,16 @@ #include <getopt.h> #include <sys/types.h> @@ -4023,10 +4016,10 @@ diff -urNp coreutils-8.16-orig/src/uniq.c coreutils-8.16/src/uniq.c skip_chars = 0; skip_fields = 0; check_chars = SIZE_MAX; -diff -urNp coreutils-8.16-orig/tests/Makefile.am coreutils-8.16/tests/Makefile.am ---- coreutils-8.16-orig/tests/Makefile.am 2012-03-26 18:01:35.564014659 +0200 -+++ coreutils-8.16/tests/Makefile.am 2012-03-26 18:02:01.023015013 +0200 -@@ -242,6 +242,7 @@ TESTS = \ +diff -urNp coreutils-8.19-orig/tests/Makefile.am coreutils-8.19/tests/Makefile.am +--- coreutils-8.19-orig/tests/Makefile.am 2012-08-20 13:51:39.856841699 +0200 ++++ coreutils-8.19/tests/Makefile.am 2012-08-20 13:52:04.085491266 +0200 +@@ -247,6 +247,7 @@ TESTS = \ misc/sort-debug-warn \ misc/sort-discrim \ misc/sort-files0-from \ @@ -4034,7 +4027,7 @@ diff -urNp coreutils-8.16-orig/tests/Makefile.am coreutils-8.16/tests/Makefile.a misc/sort-float \ misc/sort-merge \ misc/sort-merge-fdlimit \ -@@ -537,6 +538,10 @@ TESTS = \ +@@ -551,6 +552,10 @@ TESTS = \ $(root_tests) pr_data = \ @@ -4045,9 +4038,9 @@ diff -urNp coreutils-8.16-orig/tests/Makefile.am coreutils-8.16/tests/Makefile.a pr/0F \ pr/0FF \ pr/0FFnt \ -diff -urNp coreutils-8.16-orig/tests/misc/cut coreutils-8.16/tests/misc/cut ---- coreutils-8.16-orig/tests/misc/cut 2012-02-03 10:22:06.000000000 +0100 -+++ coreutils-8.16/tests/misc/cut 2012-03-26 17:40:49.000000000 +0200 +diff -urNp coreutils-8.19-orig/tests/misc/cut coreutils-8.19/tests/misc/cut +--- coreutils-8.19-orig/tests/misc/cut 2012-07-21 16:54:31.000000000 +0200 ++++ coreutils-8.19/tests/misc/cut 2012-08-20 13:52:04.086593767 +0200 @@ -23,14 +23,15 @@ use strict; # Turn off localization of executable's output. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @@ -4077,41 +4070,98 @@ diff -urNp coreutils-8.16-orig/tests/misc/cut coreutils-8.16/tests/misc/cut ['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], ['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}], ['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, -diff -urNp coreutils-8.16-orig/tests/misc/mb1.I coreutils-8.16/tests/misc/mb1.I ---- coreutils-8.16-orig/tests/misc/mb1.I 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.16/tests/misc/mb1.I 2012-03-26 17:35:09.000000000 +0200 +diff -urNp coreutils-8.19-orig/tests/misc/expand coreutils-8.19/tests/misc/expand +--- coreutils-8.19-orig/tests/misc/expand 2012-07-21 16:54:31.000000000 +0200 ++++ coreutils-8.19/tests/misc/expand 2012-08-20 13:55:44.188467648 +0200 +@@ -23,6 +23,15 @@ use strict; + # Turn off localization of executable's output. + @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; + ++# uncommented according to upstream commit enabling multibyte paths ++my $mb_locale = $ENV{LOCALE_FR_UTF8}; ++! defined $mb_locale || $mb_locale eq 'none' ++ and $mb_locale = 'C'; ++ ++my $prog = 'expand'; ++my $try = "Try \`$prog --help' for more information.\n"; ++my $inval = "$prog: invalid byte, character or field list\n$try"; ++ + my @Tests = + ( + ['t1', '--tabs=3', {IN=>"a\tb"}, {OUT=>"a b"}], +@@ -31,6 +40,37 @@ my @Tests = + ['i2', '--tabs=3 -i', {IN=>" \ta\tb"}, {OUT=>" a\tb"}], + ); + ++if ($mb_locale ne 'C') ++ { ++ # Duplicate each test vector, appending "-mb" to the test name and ++ # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we ++ # provide coverage for the distro-added multi-byte code paths. ++ my @new; ++ foreach my $t (@Tests) ++ { ++ my @new_t = @$t; ++ my $test_name = shift @new_t; ++ ++ # Depending on whether expand is multi-byte-patched, ++ # it emits different diagnostics: ++ # non-MB: invalid byte or field list ++ # MB: invalid byte, character or field list ++ # Adjust the expected error output accordingly. ++ if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval} ++ (@new_t)) ++ { ++ my $sub = {ERR_SUBST => 's/, character//'}; ++ push @new_t, $sub; ++ push @$t, $sub; ++ } ++ push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}]; ++ } ++ push @Tests, @new; ++ } ++ ++ ++@Tests = triple_test \@Tests; ++ + my $save_temps = $ENV{DEBUG}; + my $verbose = $ENV{VERBOSE}; + +diff -urNp coreutils-8.19-orig/tests/misc/mb1.I coreutils-8.19/tests/misc/mb1.I +--- coreutils-8.19-orig/tests/misc/mb1.I 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.19/tests/misc/mb1.I 2012-08-20 13:52:04.086593767 +0200 @@ -0,0 +1,4 @@ +Apple＠10 +Banana＠5 +Citrus＠20 +Cherry＠30 -diff -urNp coreutils-8.16-orig/tests/misc/mb1.X coreutils-8.16/tests/misc/mb1.X ---- coreutils-8.16-orig/tests/misc/mb1.X 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.16/tests/misc/mb1.X 2012-03-26 17:35:09.000000000 +0200 +diff -urNp coreutils-8.19-orig/tests/misc/mb1.X coreutils-8.19/tests/misc/mb1.X +--- coreutils-8.19-orig/tests/misc/mb1.X 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.19/tests/misc/mb1.X 2012-08-20 13:52:04.087526516 +0200 @@ -0,0 +1,4 @@ +Banana＠5 +Apple＠10 +Citrus＠20 +Cherry＠30 -diff -urNp coreutils-8.16-orig/tests/misc/mb2.I coreutils-8.16/tests/misc/mb2.I ---- coreutils-8.16-orig/tests/misc/mb2.I 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.16/tests/misc/mb2.I 2012-03-26 17:35:09.000000000 +0200 +diff -urNp coreutils-8.19-orig/tests/misc/mb2.I coreutils-8.19/tests/misc/mb2.I +--- coreutils-8.19-orig/tests/misc/mb2.I 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.19/tests/misc/mb2.I 2012-08-20 13:52:04.088593815 +0200 @@ -0,0 +1,4 @@ +Apple＠ＡＡ10＠＠20 +Banana＠ＡＡ5＠＠30 +Citrus＠ＡＡ20＠＠5 +Cherry＠ＡＡ30＠＠10 -diff -urNp coreutils-8.16-orig/tests/misc/mb2.X coreutils-8.16/tests/misc/mb2.X ---- coreutils-8.16-orig/tests/misc/mb2.X 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.16/tests/misc/mb2.X 2012-03-26 17:35:09.000000000 +0200 +diff -urNp coreutils-8.19-orig/tests/misc/mb2.X coreutils-8.19/tests/misc/mb2.X +--- coreutils-8.19-orig/tests/misc/mb2.X 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.19/tests/misc/mb2.X 2012-08-20 13:52:04.088593815 +0200 @@ -0,0 +1,4 @@ +Citrus＠ＡＡ20＠＠5 +Cherry＠ＡＡ30＠＠10 +Apple＠ＡＡ10＠＠20 +Banana＠ＡＡ5＠＠30 -diff -urNp coreutils-8.16-orig/tests/misc/sort-mb-tests coreutils-8.16/tests/misc/sort-mb-tests ---- coreutils-8.16-orig/tests/misc/sort-mb-tests 1970-01-01 01:00:00.000000000 +0100 -+++ coreutils-8.16/tests/misc/sort-mb-tests 2012-03-26 17:35:09.000000000 +0200 +diff -urNp coreutils-8.19-orig/tests/misc/sort-mb-tests coreutils-8.19/tests/misc/sort-mb-tests +--- coreutils-8.19-orig/tests/misc/sort-mb-tests 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.19/tests/misc/sort-mb-tests 2012-08-20 13:52:04.089593318 +0200 @@ -0,0 +1,58 @@ +#! /bin/sh +case $# in diff --git a/coreutils/patches/coreutils-ipfire-disabled-tests.patch b/coreutils/patches/coreutils-ipfire-disabled-tests.patch index 92b51c2..775e638 100644 --- a/coreutils/patches/coreutils-ipfire-disabled-tests.patch +++ b/coreutils/patches/coreutils-ipfire-disabled-tests.patch @@ -1,6 +1,6 @@ diff -Nur a/tests/Makefile.am b/tests/Makefile.am ---- a/tests/Makefile.am 2012-03-24 19:22:13.000000000 +0100 -+++ b/tests/Makefile.am 2012-04-28 15:42:22.861910633 +0200 +--- a/tests/Makefile.am 2012-08-18 08:02:47.000000000 +0200 ++++ b/tests/Makefile.am 2012-08-26 14:57:03.065516651 +0200 @@ -24,7 +24,6 @@ root_tests = \ @@ -9,15 +9,23 @@ diff -Nur a/tests/Makefile.am b/tests/Makefile.am cp/preserve-gid \ cp/special-bits \ cp/cp-mv-enotsup-xattr \ -@@ -195,7 +194,6 @@ +@@ -199,7 +198,6 @@ misc/groups-version \ misc/head-c \ misc/head-pos \ - misc/id-context \ misc/id-groups \ + misc/id-setgid \ misc/md5sum \ - misc/md5sum-bsd \ -@@ -408,12 +406,10 @@ +@@ -252,7 +250,6 @@ + misc/sort-merge \ + misc/sort-merge-fdlimit \ + misc/sort-month \ +- misc/sort-exit-early \ + misc/sort-rand \ + misc/sort-spinlock-abuse \ + misc/sort-stale-thread-mem \ +@@ -421,12 +418,10 @@ du/trailing-slash \ du/two-args \ id/gnu-zero-uids \ diff --git a/network/network.nm b/network/network.nm index 03816d7..9d4d5a5 100644 --- a/network/network.nm +++ b/network/network.nm @@ -6,7 +6,7 @@ name = network epoch = 1 version = 005 -release = 1.3 +release = 2 arch = noarch maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -28,7 +28,7 @@ build install_cmds # Create some dummy configuration files. mkdir -pv %{BUILDROOT}%{sysconfdir}/{firewall,network} - touch %{BUILDROOT}%{sysconfdir}/network/{config,dns-servers} + touch %{BUILDROOT}%{sysconfdir}/network/{config,dns-servers,routes} end end diff --git a/pdns-recursor/pdns-recursor.nm b/pdns-recursor/pdns-recursor.nm index aa22152..cbcaa2e 100644 --- a/pdns-recursor/pdns-recursor.nm +++ b/pdns-recursor/pdns-recursor.nm @@ -5,7 +5,7 @@ name = pdns-recursor version = 3.3 -release = 8 +release = 9 groups = Networking/DNS url = http://powerdns.com/ diff --git a/pdns-recursor/systemd/pdns-recursor.service b/pdns-recursor/systemd/pdns-recursor.service index 0d3c99a..095b595 100644 --- a/pdns-recursor/systemd/pdns-recursor.service +++ b/pdns-recursor/systemd/pdns-recursor.service @@ -3,7 +3,7 @@ Description=Power DNS Recursor Daemon After=network.target [Service] -ExecStart=/usr/sbin/pdns_recursor --daemon=no +ExecStart=/usr/sbin/pdns_recursor --config-dir=/etc/pdns --daemon=no ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.pid ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.controlsocket Restart=on-failure diff --git a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch index 8e6881d..e5a2182 100644 --- a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch +++ b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch @@ -26,19 +26,19 @@ -USRBIN += utmpdump wall -MAN1 += mountpoint.1 wall.1 -MAN8 += sulogin.8 bootlogd.8 -+SBIN += sulogin -+USRBIN += utmpdump ++SBIN += ++USRBIN += +MAN1 += mountpoint.1 -+MAN8 += sulogin.8 ++MAN8 += endif ifeq ($(DISTRO),Debian) BIN += mountpoint -SBIN += sulogin bootlogd -+SBIN += sulogin ++SBIN += MAN1 += mountpoint.1 -MAN8 += sulogin.8 bootlogd.8 -+MAN8 += sulogin.8 ++MAN8 += endif ifeq ($(DISTRO),Owl) diff --git a/sysvinit/sysvinit.nm b/sysvinit/sysvinit.nm index 5627f76..637b564 100644 --- a/sysvinit/sysvinit.nm +++ b/sysvinit/sysvinit.nm @@ -5,7 +5,7 @@ name = sysvinit version = 2.86 -release = 4 +release = 5 groups = System/Base url = https://alioth.debian.org/projects/pkg-sysvinit/ @@ -13,7 +13,7 @@ license = GPLv2+ summary = Programs which control basic system processes. description - The sysvinit package contains a group of processes that control \ + The sysvinit package contains a group of processes that control the very basic functions of your system. end diff --git a/util-linux/pam.d/su b/util-linux/pam.d/su new file mode 100644 index 0000000..85e67a8 --- /dev/null +++ b/util-linux/pam.d/su @@ -0,0 +1,12 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +# Uncomment the following line to implicitly trust users in the "wheel" group. +#auth sufficient pam_wheel.so trust use_uid +# Uncomment the following line to require a user to be in the "wheel" group. +#auth required pam_wheel.so use_uid +auth include system-auth +account sufficient pam_succeed_if.so uid = 0 use_uid quiet +account include system-auth +password include system-auth +session include system-auth +session optional pam_xauth.so diff --git a/util-linux/pam.d/su-l b/util-linux/pam.d/su-l new file mode 100644 index 0000000..656a139 --- /dev/null +++ b/util-linux/pam.d/su-l @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth include su +account include su +password include su +session optional pam_keyinit.so force revoke +session include su diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 040c415..676683d 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -4,9 +4,9 @@ ############################################################################### name = util-linux -major_ver = 2.21 +major_ver = 2.22 version = %{major_ver} -release = 4 +release = 1 groups = System/Base url = http://kernel.org/~kzak/util-linux/ @@ -25,12 +25,14 @@ source_dl = ftp://ftp.kernel.org/pub/linux/utils/util-linux/v%{major_ver}/ build requires audit-devel + coreutils >= 8.19 gettext libcap-devel libselinux-devel libsepol-devel ncurses-devel pam-devel + libudev-devel zlib-devel end @@ -40,14 +42,18 @@ build -D_FILE_OFFSET_BITS=64 configure_options += \ + --with-systemdsystemunitdir=%{unitdir} \ --disable-wall \ + --enable-eject \ --enable-kill \ - --enable-login-utils \ --enable-partx \ --enable-write \ + --enable-su \ + --enable-socket-activation \ --enable-libmount-mount \ --with-selinux \ --with-audit \ + --with-udev \ --disable-makeinstall-chown \ --disable-static @@ -63,8 +69,10 @@ build install_cmds mkdir -pv \ + %{BUILDROOT}/var/lib/libuuid \ %{BUILDROOT}/var/lib/hwclock \ %{BUILDROOT}/usr/share/man/man8 \ + %{BUILDROOT}/run/uuidd \ %{BUILDROOT}/var/log install -m 755 %{DIR_APP}/nologin %{BUILDROOT}%{sbindir} @@ -85,6 +93,10 @@ build setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/mount chmod -v -s %{BUILDROOT}%{bindir}/umount setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/umount + + # su (set right capabilities) + chmod -v u-s %{BUILDROOT}%{bindir}/su + setcap cap_setgid,cap_setuid+ep %{BUILDROOT}%{bindir}/su end end @@ -97,10 +109,13 @@ packages end provides + eject = %{thisver} /bin/dmesg + /bin/eject /bin/kill /bin/more /bin/mount + /bin/su /bin/umount /sbin/blkid /sbin/blockdev @@ -109,10 +124,14 @@ packages /sbin/nologin end - obsoletes = util-linux-ng + obsoletes + util-linux-ng + eject <= 2.1.5 + end conflicts filesystem < 002 + coreutils < 8.19 setup < 3.0-2 util-linux-ng sysvinit <= 2.86-2 @@ -169,6 +188,10 @@ packages part of util-linux. end + requires + uuidd=%{thisver} + end + conflicts = filesystem < 002 files @@ -217,6 +240,53 @@ packages end end + package uuidd + summary = Helper daemon to guarantee uniqueness of time-based UUIDs. + description + The uuidd package contains a userspace daemon (uuidd) which guarantees + uniqueness of time-based UUID generation even at very high rates on + SMP systems. + end + + groups += Base + + files + %{sbindir}/uuidd + %{mandir}/man8/uuidd.8* + %{sharedstatedir}/libuuid + %{unitdir}/uuidd* + /run/uuidd + end + + prerequires += shadow-utils + + script prein + getent group uuidd >/dev/null || groupadd -r uuidd + getent passwd uuidd >/dev/null || \ + useradd -r -g uuidd -d %{sharedstatedir}/libuuid -s /sbin/nologin \ + -c "UUID generator helper daemon" uuidd + end + + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl enable uuidd.service >/dev/null 2>&1 || : + end + + script preun + systemctl --no-reload disable uuidd.service >/dev/null 2>&1 || : + systemctl stop uuidd.service >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart uuidd.service >/dev/null 2>&1 || : + end + end + package %{name}-debuginfo template DEBUGINFO end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d58a8ffee17f2a4867c0653b4d33666ec40f5b69
by git＠ipfire.org 27 Oct '12

27 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via d58a8ffee17f2a4867c0653b4d33666ec40f5b69 (commit) via be9485b2dbd33570816d0a7ed04ff37d51d31f58 (commit) via 1b9693a9d964884e3236e8ee8d5d6dc3d367ef2f (commit) via e149c24288f1fdb56f9b512891124c617a498503 (commit) via e8a8cf219c0daf68ef78a0936e045cb5663df978 (commit) via e3399d19616a9e8e6bce0675f1ce2a84030fb942 (commit) via 989f12ada35a58ac799d8cbea54da62a59b7ddc2 (commit) via 97dc700dcac04f24b52cfd2f098c896455041d11 (commit) via 4d811cc066066c3eb2e8ca4ba0076f93ac1f8daf (commit) via 3b3941e469685a4292bbb6f9cdc6131306c2b3e5 (commit) via bdc400af2f0d4bcd8dc535770eb460e9847f4010 (commit) via 79fdc28c787d13d1a15ca852b8e8c1a512a56ed4 (commit) via 5d25f1b351395ff5e2d286f550270e810137c58c (commit) via e8e9e8e7c3a0df0915aec6d3a40f7fbea59927c3 (commit) via 99f1d55ba7759dffb7ac2ac451a895f6cda4e5fe (commit) via 1205840b8d5e310ad05ce88fe33e14603f870544 (commit) via 23503b40ba0d620d2429c826721b9bbff0434489 (commit) via 7d270ad90075a8ab05526ee24d2feb8d1bc461ca (commit) via 9edaaeab91fc862b244f3f3712adee83e1564705 (commit) from d42d84221801e4f266bf4c4c1ad0a646ca3a6a35 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d58a8ffee17f2a4867c0653b4d33666ec40f5b69 Merge: be9485b bdc400a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 14:20:39 2012 +0200 Merge remote-tracking branch 'stevee/dracut' commit be9485b2dbd33570816d0a7ed04ff37d51d31f58 Merge: 1b9693a e8e9e8e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 14:19:43 2012 +0200 Merge remote-tracking branch 'stevee/pdns-datafiles' commit 1b9693a9d964884e3236e8ee8d5d6dc3d367ef2f Merge: e149c24 3b3941e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 14:19:04 2012 +0200 Merge remote-tracking branch 'stevee/plymouth-update' commit e149c24288f1fdb56f9b512891124c617a498503 Merge: e8a8cf2 9edaaea Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 14:18:44 2012 +0200 Merge remote-tracking branch 'ummeegge/glib2-update' commit e8a8cf219c0daf68ef78a0936e045cb5663df978 Merge: e3399d1 7d270ad Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 14:18:17 2012 +0200 Merge remote-tracking branch 'ummeegge/nmap-update' commit e3399d19616a9e8e6bce0675f1ce2a84030fb942 Merge: 989f12a 23503b4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 14:17:46 2012 +0200 Merge remote-tracking branch 'ummeegge/tcpdump-update' commit 989f12ada35a58ac799d8cbea54da62a59b7ddc2 Merge: 97dc700 1205840 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 14:16:52 2012 +0200 Merge remote-tracking branch 'ummeegge/libssh2-update' commit 97dc700dcac04f24b52cfd2f098c896455041d11 Merge: 4d811cc 99f1d55 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 14:16:38 2012 +0200 Merge remote-tracking branch 'ummeegge/mdadm-update' commit 4d811cc066066c3eb2e8ca4ba0076f93ac1f8daf Merge: d42d842 5d25f1b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 14:16:17 2012 +0200 Merge remote-tracking branch 'ummeegge/dos2unix-update' commit 3b3941e469685a4292bbb6f9cdc6131306c2b3e5 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Oct 26 23:03:04 2012 +0200 plymouth: Update to 0.8.8. commit bdc400af2f0d4bcd8dc535770eb460e9847f4010 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Oct 26 23:00:11 2012 +0200 dracut: Enable systemd support in initramfs. From now we also will use systemd inside the initramfs, that gives us a faster startup and full debugging/logging into the system journal. commit 79fdc28c787d13d1a15ca852b8e8c1a512a56ed4 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Oct 26 22:56:54 2012 +0200 dracut: Update to 024. Fix installation on x86_64 and clean up nm file. commit 5d25f1b351395ff5e2d286f550270e810137c58c Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Fri Oct 26 16:44:38 2012 +0200 dos2unix: Update to 6.0.2. commit e8e9e8e7c3a0df0915aec6d3a40f7fbea59927c3 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Oct 26 16:11:52 2012 +0200 pdns: Don't overwrite database file on update. commit 99f1d55ba7759dffb7ac2ac451a895f6cda4e5fe Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Thu Oct 25 21:42:43 2012 +0200 mdadm: Update to 3.2.6 commit 1205840b8d5e310ad05ce88fe33e14603f870544 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Thu Oct 25 21:39:47 2012 +0200 libssh2: Update to 1.4.2 commit 23503b40ba0d620d2429c826721b9bbff0434489 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Thu Oct 25 21:34:47 2012 +0200 tcpdump: Update to 4.3.0 commit 7d270ad90075a8ab05526ee24d2feb8d1bc461ca Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Thu Oct 25 21:29:36 2012 +0200 nmap: Update to 6.01. commit 9edaaeab91fc862b244f3f3712adee83e1564705 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Thu Oct 25 20:14:25 2012 +0200 glib2: Update to 2.35.1 Fixes #10235 ----------------------------------------------------------------------- Summary of changes: dos2unix/dos2unix.nm | 6 +- dracut/dracut.nm | 11 ++- dracut/ipfire.conf | 8 ++- glib2/glib2.nm | 8 ++- libssh2/libssh2.nm | 10 ++-- mdadm/mdadm.nm | 7 +- nmap/nmap.nm | 4 +- pdns/pdns.conf | 1 + pdns/pdns.nm | 6 ++- ...-create-missing-links-for-systemd-targets.patch | 71 -------------------- plymouth/plymouth.nm | 2 +- tcpdump/tcpdump.nm | 4 +- 12 files changed, 42 insertions(+), 96 deletions(-) delete mode 100644 plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch Difference in files: diff --git a/dos2unix/dos2unix.nm b/dos2unix/dos2unix.nm index 55da321..1fde0d0 100644 --- a/dos2unix/dos2unix.nm +++ b/dos2unix/dos2unix.nm @@ -4,7 +4,7 @@ ############################################################################### name = dos2unix -version = 5.1.1 +version = 6.0.2 release = 1 groups = Applications/Text @@ -13,11 +13,11 @@ license = BSD summary = Text file format converters. description - Convert text files with DOS or Mac line endings to Unix line endings and \ + Convert text files with DOS or Mac line endings to Unix line endings and vice versa. end -source_dl = +source_dl = http://waterlan.home.xs4all.nl/dos2unix/ build requires diff --git a/dracut/dracut.nm b/dracut/dracut.nm index 18d9329..ecc26c7 100644 --- a/dracut/dracut.nm +++ b/dracut/dracut.nm @@ -4,7 +4,7 @@ ############################################################################### name = dracut -version = 019 +version = 024 release = 2 arch = noarch @@ -39,10 +39,12 @@ build dracutlibdir = %{prefix}/lib/dracut - install - make install DESTDIR=%{BUILDROOT} \ - sysconfdir=/etc mandir=/usr/share/man + make_install_targets += \ + sysconfdir=%{sysconfdir} \ + libdir=%{dracutlibdir} \ + mandir=%{mandir} + install_cmds # Install local configuration. mkdir -pv %{BUILDROOT}/etc/dracut.conf.d cp -vf %{DIR_SOURCE}/ipfire.conf %{BUILDROOT}/etc/dracut.conf.d/ipfire.conf @@ -84,6 +86,7 @@ packages lvm2 mdadm sysvinit + systemd >= 187 udev util-linux which diff --git a/dracut/ipfire.conf b/dracut/ipfire.conf index b27d624..a6b717c 100644 --- a/dracut/ipfire.conf +++ b/dracut/ipfire.conf @@ -4,4 +4,10 @@ i18n_vars="/etc/vconsole.conf:KEYTABLE-KEYMAP,SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP" #add_dracutmodules+=" " stdloglvl=3 -prefix=/run/initramfs +prefix="/" +systemdutildir=/usr/lib/systemd +systemdsystemunitdir=/usr/lib/systemd/system +udevdir=/usr/lib/udev +add_dracutmodules+=" systemd " +realinitpath="/usr/lib/systemd/systemd" +kernel_cmdline+=" rd.auto=1 " diff --git a/glib2/glib2.nm b/glib2/glib2.nm index 62e04f0..d08a1b5 100644 --- a/glib2/glib2.nm +++ b/glib2/glib2.nm @@ -4,11 +4,13 @@ ############################################################################### name = glib2 -ver_major = 2.31 -version = %{ver_major}.2 -release = 2 +ver_major = 2.35 +ver_minor = 1 +version = %{ver_major}.%{ver_minor} +release = 1 thisapp = glib-%{version} +maintainer = Erik Kapfer <erik.kapfer(a)ipfire.org> groups = System/Libraries url = http://www.gtk.org license = LGPLv2+ diff --git a/libssh2/libssh2.nm b/libssh2/libssh2.nm index 16312fc..901886f 100644 --- a/libssh2/libssh2.nm +++ b/libssh2/libssh2.nm @@ -4,7 +4,7 @@ ############################################################################### name = libssh2 -version = 1.2.7 +version = 1.4.2 release = 1 groups = System/Libraries @@ -13,13 +13,13 @@ license = BSD summary = A library implementing the SSH2 protocol. description - libssh2 is a library implementing the SSH2 protocol as defined by \ - Internet Drafts: SECSH-TRANS(22), SECSH-USERAUTH(25), \ - SECSH-CONNECTION(23), SECSH-ARCH(20), SECSH-FILEXFER(06)*, \ + libssh2 is a library implementing the SSH2 protocol as defined by + Internet Drafts: SECSH-TRANS(22), SECSH-USERAUTH(25), + SECSH-CONNECTION(23), SECSH-ARCH(20), SECSH-FILEXFER(06)*, SECSH-DHGEX(04), and SECSH-NUMBERS(10). end -source_dl = +source_dl = http://www.libssh2.org/download/ build requires diff --git a/mdadm/mdadm.nm b/mdadm/mdadm.nm index a166010..159034c 100644 --- a/mdadm/mdadm.nm +++ b/mdadm/mdadm.nm @@ -4,8 +4,8 @@ ############################################################################### name = mdadm -version = 3.2.2 -release = 2 +version = 3.2.6 +release = 1 groups = System/Base url = http://www.kernel.org/pub/linux/utils/raid/mdadm/ @@ -20,7 +20,8 @@ description file can be used to help with some common tasks. end -source_dl = +source_dl = https://www.kernel.org/pub/linux/utils/raid/mdadm/ +sources = %{thisapp}.tar.xz build requires diff --git a/nmap/nmap.nm b/nmap/nmap.nm index 4df52f7..c57bf72 100644 --- a/nmap/nmap.nm +++ b/nmap/nmap.nm @@ -4,7 +4,7 @@ ############################################################################### name = nmap -version = 5.51 +version = 6.01 release = 1 groups = Networking/Sniffer @@ -20,7 +20,7 @@ description predictability characteristics, reverse-identd scanning, and more. end -source_dl = +source_dl = http://nmap.org/dist/ sources = %{thisapp}.tar.bz2 build diff --git a/pdns/pdns.conf b/pdns/pdns.conf index 0630ed5..7c43c0a 100644 --- a/pdns/pdns.conf +++ b/pdns/pdns.conf @@ -22,3 +22,4 @@ gsqlite3-database=/var/lib/pdns/pdns.db # All queries that could not be answered by ourself get sent to # the local recursor. recursor=[::1]:54 +allow-recursion=127.0.0.1 ::1 diff --git a/pdns/pdns.nm b/pdns/pdns.nm index 35f5697..5c01ec1 100644 --- a/pdns/pdns.nm +++ b/pdns/pdns.nm @@ -5,7 +5,7 @@ name = pdns version = 3.1 -release = 4 +release = 5 groups = Networking/DNS url = http://powerdns.com/ @@ -111,6 +111,10 @@ packages %{sysconfdir}/pdns/pdns.conf end + datafiles + %{sharedstatedir}/pdns/pdns.db + end + script prein %{create_user} end diff --git a/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch b/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch deleted file mode 100644 index 1e1aa95..0000000 --- a/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch +++ /dev/null @@ -1,71 +0,0 @@ -From edde4e0f2b85c6f298569fe219a08361b99b016b Mon Sep 17 00:00:00 2001 -From: Frederic Crozat <fcrozat(a)suse.com> -Date: Fri, 20 Jul 2012 13:28:31 +0000 -Subject: systemd: create missing links various targets - ---- -diff --git a/systemd-units/Makefile.am b/systemd-units/Makefile.am -index 1545a04..2f5e61f 100644 ---- a/systemd-units/Makefile.am -+++ b/systemd-units/Makefile.am -@@ -13,6 +13,58 @@ systemd_unit_templates = \ - if ENABLE_SYSTEMD_INTEGRATION - systemdunitdir=$(SYSTEMD_UNIT_DIR) - systemdunit_DATA = $(systemd_unit_templates:.in=) -+ -+install-data-hook: -+ $(MKDIR_P) -m 0755 \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants && \ -+ rm -f plymouth-start.service plymouth-read-write.service && \ -+ $(LN_S) ../plymouth-start.service && \ -+ $(LN_S) ../plymouth-read-write.service) -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants && \ -+ rm -f plymouth-quit.service plymouth-quit-wait.service && \ -+ $(LN_S) ../plymouth-quit.service && \ -+ $(LN_S) ../plymouth-quit-wait.service) -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants && \ -+ rm -f plymouth-reboot.service && \ -+ $(LN_S) ../plymouth-reboot.service) -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants && \ -+ rm -f plymouth-kexec.service && \ -+ $(LN_S) ../plymouth-kexec.service) -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants && \ -+ rm -f plymouth-poweroff.service && \ -+ $(LN_S) ../plymouth-poweroff.service) -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants && \ -+ rm -f plymouth-halt.service && \ -+ $(LN_S) ../plymouth-halt.service) -+ -+uninstall-hook: -+ rm -f \ -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants && \ -+ rm -f plymouth-start.service plymouth-read-write.service) \ -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants && \ -+ rm -f plymouth-quit.service plymouth-quit-wait.service) \ -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants && \ -+ rm -f plymouth-reboot.service) \ -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants && \ -+ rm -f plymouth-kexec.service) \ -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants && \ -+ rm -f plymouth-poweroff.service) \ -+ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants && \ -+ rm -f plymouth-halt.service) \ -+ rmdir --ignore-fail-on-non-empty \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants -+ - endif - - EXTRA_DIST = $(systemd_unit_templates) $(systemdunit_DATA) --- -cgit v0.9.0.2-2-gbebe diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm index 96507de..cbecf07 100644 --- a/plymouth/plymouth.nm +++ b/plymouth/plymouth.nm @@ -4,7 +4,7 @@ ############################################################################### name = plymouth -version = 0.8.6.1 +version = 0.8.8 release = 1 groups = System/Base diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm index 2a81d25..201426e 100644 --- a/tcpdump/tcpdump.nm +++ b/tcpdump/tcpdump.nm @@ -4,8 +4,8 @@ ############################################################################### name = tcpdump -version = 4.1.1 -release = 2 +version = 4.3.0 +release = 1 groups = Networking/Sniffer url = http://www.tcpdump.org/ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d42d84221801e4f266bf4c4c1ad0a646ca3a6a35
by git＠ipfire.org 27 Oct '12

27 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via d42d84221801e4f266bf4c4c1ad0a646ca3a6a35 (commit) via 1802011e05e4b568da3eca36bc2a2f2a28a4847f (commit) via 4834f4e8c4f5bca4eedd1b980f7194fc39dce0e7 (commit) from 034363f52c85e0dc561fdae33f3b17971d75d947 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d42d84221801e4f266bf4c4c1ad0a646ca3a6a35 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 11:50:19 2012 +0200 hdparm: Fix misspelled variable. No rebuild required. commit 1802011e05e4b568da3eca36bc2a2f2a28a4847f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 11:49:44 2012 +0200 python: Move arch-dependent patches into own directory. Also require glibc with RPC enabled. commit 4834f4e8c4f5bca4eedd1b980f7194fc39dce0e7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Oct 27 11:48:31 2012 +0200 glibc: Enable obsolete RPC implementation. RPC has been removed from glibc in 2.16. However some packages like python still need it. ----------------------------------------------------------------------- Summary of changes: glibc/glibc.nm | 5 +++-- hdparm/hdparm.nm | 2 +- .../x86_64}/python-2.7-lib64-sysconfig.patch | 0 .../{ => patches/x86_64}/python-2.7.3-lib64.patch | 0 python/python.nm | 11 +++-------- 5 files changed, 7 insertions(+), 11 deletions(-) rename python/{ => patches/x86_64}/python-2.7-lib64-sysconfig.patch (100%) rename python/{ => patches/x86_64}/python-2.7.3-lib64.patch (100%) Difference in files: diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 8a12d01..23ac9c7 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -5,7 +5,7 @@ name = glibc version = 2.16.0 -release = 3 +release = 4 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base @@ -155,7 +155,8 @@ build --with-selinux \ --disable-werror \ --enable-bind-now \ - --enable-nss-crypt + --enable-nss-crypt \ + --enable-obsolete-rpc if "%{DISTRO_ARCH}" == "armv5tel" # Disable hardware FP for ARM. diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm index aac269c..2f9b5fb 100644 --- a/hdparm/hdparm.nm +++ b/hdparm/hdparm.nm @@ -22,7 +22,7 @@ source_dl = http://sourceforge.net/projects/%{name}/files/%{name}/ build build - CFLAGS="%{CFLAGS}" make %{PARALELLIAMFLAGS} \ + CFLAGS="%{CFLAGS}" make %{PARALLELISMFLAGS} \ STRIP=/bin/true LDFLAGS= end diff --git a/python/patches/x86_64/python-2.7-lib64-sysconfig.patch b/python/patches/x86_64/python-2.7-lib64-sysconfig.patch new file mode 100644 index 0000000..0cef361 --- /dev/null +++ b/python/patches/x86_64/python-2.7-lib64-sysconfig.patch @@ -0,0 +1,44 @@ +diff -up Python-2.7/Lib/sysconfig.py.lib64-sysconfig Python-2.7/Lib/sysconfig.py +--- Python-2.7/Lib/sysconfig.py.lib64-sysconfig 2010-07-08 14:18:41.386898476 -0400 ++++ Python-2.7/Lib/sysconfig.py 2010-07-08 14:22:02.837896461 -0400 +@@ -7,20 +7,20 @@ from os.path import pardir, realpath + + _INSTALL_SCHEMES = { + 'posix_prefix': { +- 'stdlib': '{base}/lib/python{py_version_short}', +- 'platstdlib': '{platbase}/lib/python{py_version_short}', ++ 'stdlib': '{base}/lib64/python{py_version_short}', ++ 'platstdlib': '{platbase}/lib64/python{py_version_short}', + 'purelib': '{base}/lib/python{py_version_short}/site-packages', +- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', + 'include': '{base}/include/python{py_version_short}', + 'platinclude': '{platbase}/include/python{py_version_short}', + 'scripts': '{base}/bin', + 'data': '{base}', + }, + 'posix_home': { +- 'stdlib': '{base}/lib/python', +- 'platstdlib': '{base}/lib/python', ++ 'stdlib': '{base}/lib64/python', ++ 'platstdlib': '{base}/lib64/python', + 'purelib': '{base}/lib/python', +- 'platlib': '{base}/lib/python', ++ 'platlib': '{base}/lib64/python', + 'include': '{base}/include/python', + 'platinclude': '{base}/include/python', + 'scripts': '{base}/bin', +@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { + 'data' : '{userbase}', + }, + 'posix_user': { +- 'stdlib': '{userbase}/lib/python{py_version_short}', +- 'platstdlib': '{userbase}/lib/python{py_version_short}', ++ 'stdlib': '{userbase}/lib64/python{py_version_short}', ++ 'platstdlib': '{userbase}/lib64/python{py_version_short}', + 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', +- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', ++ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', + 'include': '{userbase}/include/python{py_version_short}', + 'scripts': '{userbase}/bin', + 'data' : '{userbase}', diff --git a/python/patches/x86_64/python-2.7.3-lib64.patch b/python/patches/x86_64/python-2.7.3-lib64.patch new file mode 100644 index 0000000..b3d5d91 --- /dev/null +++ b/python/patches/x86_64/python-2.7.3-lib64.patch @@ -0,0 +1,201 @@ +diff -up Python-2.7.1/Lib/distutils/command/install.py.lib64 Python-2.7.1/Lib/distutils/command/install.py +--- Python-2.7.1/Lib/distutils/command/install.py.lib64 2010-05-05 15:09:31.000000000 -0400 ++++ Python-2.7.1/Lib/distutils/command/install.py 2010-12-23 15:51:19.422062062 -0500 +@@ -42,14 +42,14 @@ else: + INSTALL_SCHEMES = { + 'unix_prefix': { + 'purelib': '$base/lib/python$py_version_short/site-packages', +- 'platlib': '$platbase/lib/python$py_version_short/site-packages', ++ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', + 'headers': '$base/include/python$py_version_short/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', + }, + 'unix_home': { + 'purelib': '$base/lib/python', +- 'platlib': '$base/lib/python', ++ 'platlib': '$base/lib64/python', + 'headers': '$base/include/python/$dist_name', + 'scripts': '$base/bin', + 'data' : '$base', +diff -up Python-2.7.1/Lib/distutils/sysconfig.py.lib64 Python-2.7.1/Lib/distutils/sysconfig.py +--- Python-2.7.1/Lib/distutils/sysconfig.py.lib64 2010-11-06 10:16:30.000000000 -0400 ++++ Python-2.7.1/Lib/distutils/sysconfig.py 2010-12-23 15:51:19.423063652 -0500 +@@ -114,8 +114,12 @@ def get_python_lib(plat_specific=0, stan + prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": ++ if plat_specific or standard_lib: ++ lib = "lib64" ++ else: ++ lib = "lib" + libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) ++ lib, "python" + get_python_version()) + if standard_lib: + return libpython + else: +diff -up Python-2.7.1/Lib/site.py.lib64 Python-2.7.1/Lib/site.py +--- Python-2.7.1/Lib/site.py.lib64 2010-10-12 18:53:51.000000000 -0400 ++++ Python-2.7.1/Lib/site.py 2010-12-23 15:51:19.424063606 -0500 +@@ -290,12 +290,16 @@ def getsitepackages(): + if sys.platform in ('os2emx', 'riscos'): + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) + elif os.sep == '/': ++ sitepackages.append(os.path.join(prefix, "lib64", ++ "python" + sys.version[:3], ++ "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], + "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-python")) + else: + sitepackages.append(prefix) ++ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) + sitepackages.append(os.path.join(prefix, "lib", "site-packages")) + if sys.platform == "darwin": + # for framework builds *only* we add the standard Apple +diff -up Python-2.7.1/Lib/test/test_site.py.lib64 Python-2.7.1/Lib/test/test_site.py +--- Python-2.7.1/Lib/test/test_site.py.lib64 2010-11-21 08:34:58.000000000 -0500 ++++ Python-2.7.1/Lib/test/test_site.py 2010-12-23 15:55:19.782935931 -0500 +@@ -241,18 +241,22 @@ + self.assertEqual(dirs[2], wanted) + elif os.sep == '/': + # OS X non-framwework builds, Linux, FreeBSD, etc +- self.assertEqual(len(dirs), 2) ++ self.assertEquals(len(dirs), 3) ++ wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], ++ 'site-packages') ++ self.assertEquals(dirs[0], wanted) + wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], + 'site-packages') +- self.assertEqual(dirs[0], wanted) ++ self.assertEquals(dirs[1], wanted) + wanted = os.path.join('xoxo', 'lib', 'site-python') +- self.assertEqual(dirs[1], wanted) ++ self.assertEquals(dirs[2], wanted) + else: + # other platforms +- self.assertEqual(len(dirs), 2) +- self.assertEqual(dirs[0], 'xoxo') +- wanted = os.path.join('xoxo', 'lib', 'site-packages') +- self.assertEqual(dirs[1], wanted) ++ self.assertEquals(len(dirs), 2) ++ self.assertEquals(dirs[0], 'xoxo') ++ wanted = os.path.join('xoxo', 'lib64', 'site-packages') ++ self.assertEquals(dirs[1], wanted) ++ + + class PthFile(object): + """Helper class for handling testing of .pth files""" +diff -up Python-2.7.1/Makefile.pre.in.lib64 Python-2.7.1/Makefile.pre.in +--- Python-2.7.1/Makefile.pre.in.lib64 2010-12-23 15:51:19.407063264 -0500 ++++ Python-2.7.1/Makefile.pre.in 2010-12-23 15:51:19.426063917 -0500 +@@ -94,7 +94,7 @@ LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ + CONFINCLUDEDIR= $(exec_prefix)/include +-SCRIPTDIR= $(prefix)/lib ++SCRIPTDIR= $(prefix)/lib64 + + # Detailed destination directories + BINLIBDEST= $(LIBDIR)/python$(VERSION) +diff -up Python-2.7.1/Modules/getpath.c.lib64 Python-2.7.1/Modules/getpath.c +--- Python-2.7.1/Modules/getpath.c.lib64 2010-10-07 19:37:08.000000000 -0400 ++++ Python-2.7.1/Modules/getpath.c 2010-12-23 15:51:19.427063291 -0500 +@@ -117,8 +117,8 @@ + #endif + + #ifndef PYTHONPATH +-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ +- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ++#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ ++ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" + #endif + + #ifndef LANDMARK +@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1]; + static char exec_prefix[MAXPATHLEN+1]; + static char progpath[MAXPATHLEN+1]; + static char *module_search_path = NULL; +-static char lib_python[] = "lib/python" VERSION; ++static char lib_python[] = "lib64/python" VERSION; + + static void + reduce(char *dir) +@@ -528,7 +528,7 @@ calculate_path(void) + } + else + strncpy(zip_path, PREFIX, MAXPATHLEN); +- joinpath(zip_path, "lib/python00.zip"); ++ joinpath(zip_path, "lib64/python00.zip"); + bufsz = strlen(zip_path); /* Replace "00" with version */ + zip_path[bufsz - 6] = VERSION[0]; + zip_path[bufsz - 5] = VERSION[2]; +@@ -538,7 +538,7 @@ calculate_path(void) + fprintf(stderr, + "Could not find platform dependent libraries <exec_prefix>\n"); + strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); +- joinpath(exec_prefix, "lib/lib-dynload"); ++ joinpath(exec_prefix, "lib64/lib-dynload"); + } + /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ + +diff -up Python-2.7.1/Modules/Setup.dist.lib64 Python-2.7.1/Modules/Setup.dist +--- Python-2.7.1/Modules/Setup.dist.lib64 2010-12-23 15:51:19.400104130 -0500 ++++ Python-2.7.1/Modules/Setup.dist 2010-12-23 15:51:19.427063291 -0500 +@@ -413,7 +413,7 @@ gdbm gdbmmodule.c -lgdbm + # and the subdirectory of PORT where you built it. + DBLIBVER=4.7 + DBINC=/usr/include/db4 +-DBLIB=/usr/lib ++DBLIB=/usr/lib64 + _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) + + # Historical Berkeley DB 1.85 +@@ -459,7 +459,7 @@ cPickle cPickle.c + # Andrew Kuchling's zlib module. + # This require zlib 1.1.3 (or later). + # See http://www.gzip.org/zlib/ +-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz ++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz + + # Interface to the Expat XML parser + # +diff -up Python-2.7.1/setup.py.lib64 Python-2.7.1/setup.py +--- Python-2.7.1/setup.py.lib64 2010-10-31 12:40:21.000000000 -0400 ++++ Python-2.7.1/setup.py 2010-12-23 15:51:19.428064129 -0500 +@@ -347,7 +347,7 @@ class PyBuildExt(build_ext): + + def detect_modules(self): + # Ensure that /usr/local is always used +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + + # Add paths specified in the environment variables LDFLAGS and +@@ -654,11 +654,11 @@ class PyBuildExt(build_ext): + elif curses_library: + readline_libs.append(curses_library) + elif self.compiler.find_library_file(lib_dirs + +- ['/usr/lib/termcap'], ++ ['/usr/lib64/termcap'], + 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], ++ library_dirs=['/usr/lib64/termcap'], + extra_link_args=readline_extra_link_args, + libraries=readline_libs) ) + else: +@@ -692,8 +692,8 @@ class PyBuildExt(build_ext): + if krb5_h: + ssl_incs += krb5_h + ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, +- ['/usr/local/ssl/lib', +- '/usr/contrib/ssl/lib/' ++ ['/usr/local/ssl/lib64', ++ '/usr/contrib/ssl/lib64/' + ] ) + + if (ssl_incs is not None and diff --git a/python/python-2.7-lib64-sysconfig.patch b/python/python-2.7-lib64-sysconfig.patch deleted file mode 100644 index 0cef361..0000000 --- a/python/python-2.7-lib64-sysconfig.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up Python-2.7/Lib/sysconfig.py.lib64-sysconfig Python-2.7/Lib/sysconfig.py ---- Python-2.7/Lib/sysconfig.py.lib64-sysconfig 2010-07-08 14:18:41.386898476 -0400 -+++ Python-2.7/Lib/sysconfig.py 2010-07-08 14:22:02.837896461 -0400 -@@ -7,20 +7,20 @@ from os.path import pardir, realpath - - _INSTALL_SCHEMES = { - 'posix_prefix': { -- 'stdlib': '{base}/lib/python{py_version_short}', -- 'platstdlib': '{platbase}/lib/python{py_version_short}', -+ 'stdlib': '{base}/lib64/python{py_version_short}', -+ 'platstdlib': '{platbase}/lib64/python{py_version_short}', - 'purelib': '{base}/lib/python{py_version_short}/site-packages', -- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', -+ 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', - 'include': '{base}/include/python{py_version_short}', - 'platinclude': '{platbase}/include/python{py_version_short}', - 'scripts': '{base}/bin', - 'data': '{base}', - }, - 'posix_home': { -- 'stdlib': '{base}/lib/python', -- 'platstdlib': '{base}/lib/python', -+ 'stdlib': '{base}/lib64/python', -+ 'platstdlib': '{base}/lib64/python', - 'purelib': '{base}/lib/python', -- 'platlib': '{base}/lib/python', -+ 'platlib': '{base}/lib64/python', - 'include': '{base}/include/python', - 'platinclude': '{base}/include/python', - 'scripts': '{base}/bin', -@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { - 'data' : '{userbase}', - }, - 'posix_user': { -- 'stdlib': '{userbase}/lib/python{py_version_short}', -- 'platstdlib': '{userbase}/lib/python{py_version_short}', -+ 'stdlib': '{userbase}/lib64/python{py_version_short}', -+ 'platstdlib': '{userbase}/lib64/python{py_version_short}', - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', -+ 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', - 'scripts': '{userbase}/bin', - 'data' : '{userbase}', diff --git a/python/python-2.7.3-lib64.patch b/python/python-2.7.3-lib64.patch deleted file mode 100644 index b3d5d91..0000000 --- a/python/python-2.7.3-lib64.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff -up Python-2.7.1/Lib/distutils/command/install.py.lib64 Python-2.7.1/Lib/distutils/command/install.py ---- Python-2.7.1/Lib/distutils/command/install.py.lib64 2010-05-05 15:09:31.000000000 -0400 -+++ Python-2.7.1/Lib/distutils/command/install.py 2010-12-23 15:51:19.422062062 -0500 -@@ -42,14 +42,14 @@ else: - INSTALL_SCHEMES = { - 'unix_prefix': { - 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { - 'purelib': '$base/lib/python', -- 'platlib': '$base/lib/python', -+ 'platlib': '$base/lib64/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', -diff -up Python-2.7.1/Lib/distutils/sysconfig.py.lib64 Python-2.7.1/Lib/distutils/sysconfig.py ---- Python-2.7.1/Lib/distutils/sysconfig.py.lib64 2010-11-06 10:16:30.000000000 -0400 -+++ Python-2.7.1/Lib/distutils/sysconfig.py 2010-12-23 15:51:19.423063652 -0500 -@@ -114,8 +114,12 @@ def get_python_lib(plat_specific=0, stan - prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": -+ if plat_specific or standard_lib: -+ lib = "lib64" -+ else: -+ lib = "lib" - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ lib, "python" + get_python_version()) - if standard_lib: - return libpython - else: -diff -up Python-2.7.1/Lib/site.py.lib64 Python-2.7.1/Lib/site.py ---- Python-2.7.1/Lib/site.py.lib64 2010-10-12 18:53:51.000000000 -0400 -+++ Python-2.7.1/Lib/site.py 2010-12-23 15:51:19.424063606 -0500 -@@ -290,12 +290,16 @@ def getsitepackages(): - if sys.platform in ('os2emx', 'riscos'): - sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': -+ sitepackages.append(os.path.join(prefix, "lib64", -+ "python" + sys.version[:3], -+ "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", - "python" + sys.version[:3], - "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-python")) - else: - sitepackages.append(prefix) -+ sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) - if sys.platform == "darwin": - # for framework builds *only* we add the standard Apple -diff -up Python-2.7.1/Lib/test/test_site.py.lib64 Python-2.7.1/Lib/test/test_site.py ---- Python-2.7.1/Lib/test/test_site.py.lib64 2010-11-21 08:34:58.000000000 -0500 -+++ Python-2.7.1/Lib/test/test_site.py 2010-12-23 15:55:19.782935931 -0500 -@@ -241,18 +241,22 @@ - self.assertEqual(dirs[2], wanted) - elif os.sep == '/': - # OS X non-framwework builds, Linux, FreeBSD, etc -- self.assertEqual(len(dirs), 2) -+ self.assertEquals(len(dirs), 3) -+ wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], -+ 'site-packages') -+ self.assertEquals(dirs[0], wanted) - wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], - 'site-packages') -- self.assertEqual(dirs[0], wanted) -+ self.assertEquals(dirs[1], wanted) - wanted = os.path.join('xoxo', 'lib', 'site-python') -- self.assertEqual(dirs[1], wanted) -+ self.assertEquals(dirs[2], wanted) - else: - # other platforms -- self.assertEqual(len(dirs), 2) -- self.assertEqual(dirs[0], 'xoxo') -- wanted = os.path.join('xoxo', 'lib', 'site-packages') -- self.assertEqual(dirs[1], wanted) -+ self.assertEquals(len(dirs), 2) -+ self.assertEquals(dirs[0], 'xoxo') -+ wanted = os.path.join('xoxo', 'lib64', 'site-packages') -+ self.assertEquals(dirs[1], wanted) -+ - - class PthFile(object): - """Helper class for handling testing of .pth files""" -diff -up Python-2.7.1/Makefile.pre.in.lib64 Python-2.7.1/Makefile.pre.in ---- Python-2.7.1/Makefile.pre.in.lib64 2010-12-23 15:51:19.407063264 -0500 -+++ Python-2.7.1/Makefile.pre.in 2010-12-23 15:51:19.426063917 -0500 -@@ -94,7 +94,7 @@ LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/lib64 - - # Detailed destination directories - BINLIBDEST= $(LIBDIR)/python$(VERSION) -diff -up Python-2.7.1/Modules/getpath.c.lib64 Python-2.7.1/Modules/getpath.c ---- Python-2.7.1/Modules/getpath.c.lib64 2010-10-07 19:37:08.000000000 -0400 -+++ Python-2.7.1/Modules/getpath.c 2010-12-23 15:51:19.427063291 -0500 -@@ -117,8 +117,8 @@ - #endif - - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ -+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -129,7 +129,7 @@ static char prefix[MAXPATHLEN+1]; - static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; --static char lib_python[] = "lib/python" VERSION; -+static char lib_python[] = "lib64/python" VERSION; - - static void - reduce(char *dir) -@@ -528,7 +528,7 @@ calculate_path(void) - } - else - strncpy(zip_path, PREFIX, MAXPATHLEN); -- joinpath(zip_path, "lib/python00.zip"); -+ joinpath(zip_path, "lib64/python00.zip"); - bufsz = strlen(zip_path); /* Replace "00" with version */ - zip_path[bufsz - 6] = VERSION[0]; - zip_path[bufsz - 5] = VERSION[2]; -@@ -538,7 +538,7 @@ calculate_path(void) - fprintf(stderr, - "Could not find platform dependent libraries <exec_prefix>\n"); - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, "lib/lib-dynload"); -+ joinpath(exec_prefix, "lib64/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - -diff -up Python-2.7.1/Modules/Setup.dist.lib64 Python-2.7.1/Modules/Setup.dist ---- Python-2.7.1/Modules/Setup.dist.lib64 2010-12-23 15:51:19.400104130 -0500 -+++ Python-2.7.1/Modules/Setup.dist 2010-12-23 15:51:19.427063291 -0500 -@@ -413,7 +413,7 @@ gdbm gdbmmodule.c -lgdbm - # and the subdirectory of PORT where you built it. - DBLIBVER=4.7 - DBINC=/usr/include/db4 --DBLIB=/usr/lib -+DBLIB=/usr/lib64 - _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) - - # Historical Berkeley DB 1.85 -@@ -459,7 +459,7 @@ cPickle cPickle.c - # Andrew Kuchling's zlib module. - # This require zlib 1.1.3 (or later). - # See http://www.gzip.org/zlib/ --zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz -+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz - - # Interface to the Expat XML parser - # -diff -up Python-2.7.1/setup.py.lib64 Python-2.7.1/setup.py ---- Python-2.7.1/setup.py.lib64 2010-10-31 12:40:21.000000000 -0400 -+++ Python-2.7.1/setup.py 2010-12-23 15:51:19.428064129 -0500 -@@ -347,7 +347,7 @@ class PyBuildExt(build_ext): - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - - # Add paths specified in the environment variables LDFLAGS and -@@ -654,11 +654,11 @@ class PyBuildExt(build_ext): - elif curses_library: - readline_libs.append(curses_library) - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/lib64/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/lib64/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: -@@ -692,8 +692,8 @@ class PyBuildExt(build_ext): - if krb5_h: - ssl_incs += krb5_h - ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, -- ['/usr/local/ssl/lib', -- '/usr/contrib/ssl/lib/' -+ ['/usr/local/ssl/lib64', -+ '/usr/contrib/ssl/lib64/' - ] ) - - if (ssl_incs is not None and diff --git a/python/python.nm b/python/python.nm index d5c1a2d..8aff924 100644 --- a/python/python.nm +++ b/python/python.nm @@ -6,7 +6,7 @@ name = python major_ver = 2.7 version = %{major_ver}.3 -release = 1 +release = 2 thisapp = Python-%{version} groups = Development/Languages @@ -32,11 +32,12 @@ build bzip2-devel db4-devel >= 1:4.8 expat-devel + glibc-headers >= 2.16-4 libffi-devel libselinux-devel ncurses-devel openssl-devel - pkg-config + pakfire-builder >= 0.9.23-4 readline-devel sqlite-devel tar @@ -46,12 +47,6 @@ build export CFLAGS += -D_GNU_SOURCE -fwrapv prepare_cmds - # Apply patches for x86_64. - if [ "$(uname -m)" = "x86_64" ]; then - patch -Np1 -i %{DIR_SOURCE}/python-2.7.3-lib64.patch - patch -Np1 -i %{DIR_SOURCE}/python-2.7-lib64-sysconfig.patch - fi - # Remove embedded copies of expat, zlib and libffi rm -rf Modules/{expat,zlib} rm -rf Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx} hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. a8c02fc396feddbc2c95076c2e38029ea4b58fc5
by git＠ipfire.org 26 Oct '12

26 Oct '12

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. f83650a1368d55c72869fa94c903e78c097cf598
by git＠ipfire.org 26 Oct '12

26 Oct '12

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fe3a05da3a794e3025fde4b39775876835ad735a
by git＠ipfire.org 26 Oct '12

26 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via fe3a05da3a794e3025fde4b39775876835ad735a (commit) from 03207e65b1244bb4a82a55bc1e1f893e05695aa0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fe3a05da3a794e3025fde4b39775876835ad735a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 26 15:36:48 2012 +0200 pakfire: compression detection needs an extension. ----------------------------------------------------------------------- Summary of changes: src/pakfire/lib/functions.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index 9c8bf53..3f7dbff 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -24,13 +24,13 @@ extract_files() { echo "Extracting files..." - tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / echo "...Finished." } extract_backup_includes() { echo "Extracting backup includes..." - tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \ + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / \ var/ipfire/backup/addons/includes echo "...Finished." } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 03207e65b1244bb4a82a55bc1e1f893e05695aa0
by git＠ipfire.org 26 Oct '12

26 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 03207e65b1244bb4a82a55bc1e1f893e05695aa0 (commit) from d6b4566d9cf63ab0848b508382b6daa836b5cc7d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 03207e65b1244bb4a82a55bc1e1f893e05695aa0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 26 09:56:31 2012 +0200 pakfire: enable compression autodetection inside the packages. ----------------------------------------------------------------------- Summary of changes: src/pakfire/lib/functions.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index bc05bd0..9c8bf53 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -24,13 +24,13 @@ extract_files() { echo "Extracting files..." - tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / + tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / echo "...Finished." } extract_backup_includes() { echo "Extracting backup includes..." - tar xvf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \ + tar xavf /opt/pakfire/tmp/files --no-overwrite-dir -p --numeric-owner -C / \ var/ipfire/backup/addons/includes echo "...Finished." } hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM October 2012