IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7861 discussions

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. d30819033d52eea130bde7d118255d9606654bf8
by git＠ipfire.org 20 Nov '13

20 Nov '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1e6ce289bd8520b07897fa0f70253c8e56acc188
by git＠ipfire.org 20 Nov '13

20 Nov '13

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 1e6ce289bd8520b07897fa0f70253c8e56acc188 (commit) from 8cb142e76d95f24c396c8b4cd5ac80ea97aee675 (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 1e6ce289bd8520b07897fa0f70253c8e56acc188 Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Mon Oct 28 18:50:30 2013 +0100 openvpn: Update to version 2.3.2 Fixes #10440 ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openvpn | 17 ++++++++++++++--- lfs/openvpn | 18 +++++++++--------- 2 files changed, 23 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index 6be9a10..ae6d6ee 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -1,8 +1,19 @@ -usr/lib/openvpn -usr/lib/openvpn/openvpn-auth-pam.so -usr/lib/openvpn/openvpn-down-root.so +#usr/include/openvpn-plugin.h +#usr/lib/openvpn +#usr/lib/openvpn/plugins +#usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.la +usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.so +#usr/lib/openvpn/plugins/openvpn-plugin-down-root.la +usr/lib/openvpn/plugins/openvpn-plugin-down-root.so usr/sbin/openvpn #usr/share/doc/openvpn +#usr/share/doc/openvpn/COPYING +#usr/share/doc/openvpn/COPYRIGHT.GPL +#usr/share/doc/openvpn/README +#usr/share/doc/openvpn/README.IPv6 +#usr/share/doc/openvpn/README.auth-pam +#usr/share/doc/openvpn/README.down-root +#usr/share/doc/openvpn/README.polarssl #usr/share/doc/openvpn/management-notes.txt #usr/share/man/man8/openvpn.8 var/ipfire/ovpn diff --git a/lfs/openvpn b/lfs/openvpn index e57aa30..87daf07 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 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 = 2.2.2 +VER = 2.3.2 THISAPP = openvpn-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c5181e27b7945fa6276d21873329c5c7 +$(DL_FILE)_MD5 = 06e5f93dbf13f2c19647ca15ffc23ac1 install : $(TARGET) @@ -73,16 +73,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/var/ipfire/ovpn \ + --enable-iproute2 \ --enable-password-save \ - --enable-pthread + --enable-plugins \ + --enable-plugin-auth-pam \ + --enable-plugin-down-root + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire - -mkdir -pv /usr/lib/openvpn - cd $(DIR_APP)/plugin/auth-pam && make - cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /usr/lib/openvpn - cd $(DIR_APP)/plugin/down-root && make - cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /usr/lib/openvpn + -mkdir -vp /usr/lib/openvpn/plugins -mkdir -vp /var/ipfire/ovpn/ca -mkdir -vp /var/ipfire/ovpn/ccd -mkdir -vp /var/ipfire/ovpn/crls hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 0fc392d65d513df573573dec57ccf06af2c29a9f
by git＠ipfire.org 20 Nov '13

20 Nov '13

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, fifteen has been updated via 0fc392d65d513df573573dec57ccf06af2c29a9f (commit) via 303b81f19c37636402d2e5f850cb683e051bbe10 (commit) via d48c456fa24545b6d9b06049fcef57850f1e02dc (commit) from 5702b0cee557ec11ecda43a2482f72f212bffa84 (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 0fc392d65d513df573573dec57ccf06af2c29a9f Merge: 5702b0c 303b81f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Nov 20 21:43:20 2013 +0100 Merge branch 'master' into fifteen ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/36 => core/73}/filelists/openssh | 0 config/rootfiles/oldcore/73/update.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) copy config/rootfiles/{oldcore/36 => core/73}/filelists/openssh (100%) Difference in files: diff --git a/config/rootfiles/core/73/filelists/openssh b/config/rootfiles/core/73/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/73/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/73/update.sh b/config/rootfiles/oldcore/73/update.sh index ee799ad..a9fed1b 100644 --- a/config/rootfiles/oldcore/73/update.sh +++ b/config/rootfiles/oldcore/73/update.sh @@ -70,7 +70,7 @@ fi sync # This update need a reboot... -#touch /var/run/need_reboot +touch /var/run/need_reboot # #Finish hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8cb142e76d95f24c396c8b4cd5ac80ea97aee675
by git＠ipfire.org 20 Nov '13

20 Nov '13

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 8cb142e76d95f24c396c8b4cd5ac80ea97aee675 (commit) via 303b81f19c37636402d2e5f850cb683e051bbe10 (commit) via d48c456fa24545b6d9b06049fcef57850f1e02dc (commit) from e2fedc9a47aa92b1572f26aeca78da2f922400c7 (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 8cb142e76d95f24c396c8b4cd5ac80ea97aee675 Merge: e2fedc9 303b81f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Nov 20 21:43:02 2013 +0100 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/36 => core/73}/filelists/openssh | 0 config/rootfiles/core/73/update.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) copy config/rootfiles/{oldcore/36 => core/73}/filelists/openssh (100%) Difference in files: diff --git a/config/rootfiles/core/73/filelists/openssh b/config/rootfiles/core/73/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/73/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/73/update.sh b/config/rootfiles/core/73/update.sh index ee799ad..a9fed1b 100644 --- a/config/rootfiles/core/73/update.sh +++ b/config/rootfiles/core/73/update.sh @@ -70,7 +70,7 @@ fi sync # This update need a reboot... -#touch /var/run/need_reboot +touch /var/run/need_reboot # #Finish hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 303b81f19c37636402d2e5f850cb683e051bbe10
by git＠ipfire.org 20 Nov '13

20 Nov '13

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, master has been updated via 303b81f19c37636402d2e5f850cb683e051bbe10 (commit) from d48c456fa24545b6d9b06049fcef57850f1e02dc (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 303b81f19c37636402d2e5f850cb683e051bbe10 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Nov 20 21:28:05 2013 +0100 Add openssh update to core update 73. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/36 => core/73}/filelists/openssh | 0 config/rootfiles/core/73/update.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) copy config/rootfiles/{oldcore/36 => core/73}/filelists/openssh (100%) Difference in files: diff --git a/config/rootfiles/core/73/filelists/openssh b/config/rootfiles/core/73/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/73/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/73/update.sh b/config/rootfiles/core/73/update.sh index ee799ad..a9fed1b 100644 --- a/config/rootfiles/core/73/update.sh +++ b/config/rootfiles/core/73/update.sh @@ -70,7 +70,7 @@ fi sync # This update need a reboot... -#touch /var/run/need_reboot +touch /var/run/need_reboot # #Finish hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 5702b0cee557ec11ecda43a2482f72f212bffa84
by git＠ipfire.org 20 Nov '13

20 Nov '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. a5d81233a3a6638f6138c21d6174f73f99eb93fe
by git＠ipfire.org 20 Nov '13

20 Nov '13

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, fifteen has been updated via a5d81233a3a6638f6138c21d6174f73f99eb93fe (commit) via 147446202ff649e7371cc45d040626d7ab262cf4 (commit) via 80469a89354a686b5fc56066828ed763f81e55a4 (commit) via b474c1ca151c323ae5f8a4b402960cfa0f21c6cf (commit) via 5c3fa3223a4de6eb3a62d1c97c52f1762faa07f4 (commit) via 35e188494d9723b977c010eedbac98820e7176a6 (commit) via ba109afd0d551909be86bb11d797f1db80ce56f6 (commit) from 1ee33ddadf2737588ea50326bbc5995e93864aa3 (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 a5d81233a3a6638f6138c21d6174f73f99eb93fe Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Nov 20 07:37:51 2013 +0100 setup: change persistent network rules for new udev. commit 147446202ff649e7371cc45d040626d7ab262cf4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Nov 20 07:37:01 2013 +0100 udev: disable new netdev names and systemd log prefix. commit 80469a89354a686b5fc56066828ed763f81e55a4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 18 23:36:10 2013 +0100 initskripts: updates for new udev. commit b474c1ca151c323ae5f8a4b402960cfa0f21c6cf Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 18 23:34:00 2013 +0100 stage2: add /run symlink to /var/run. commit 5c3fa3223a4de6eb3a62d1c97c52f1762faa07f4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 18 23:30:27 2013 +0100 dracut: fixes for new udev and missing scsi_wait. commit 35e188494d9723b977c010eedbac98820e7176a6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 18 23:27:37 2013 +0100 udev: update to 208. commit ba109afd0d551909be86bb11d797f1db80ce56f6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 18 19:00:51 2013 +0100 kmod: replace module-init-tools by kmod-13. newer udev depend on kmod. ----------------------------------------------------------------------- Summary of changes: config/etc/modprobe.d/{cfg80211 => cfg80211.conf} | 0 .../etc/modprobe.d/{pcspeaker => pcspeaker.conf} | 0 config/rootfiles/common/armv5tel/linux | 6 +- config/rootfiles/common/armv5tel/linux-kirkwood | 6 +- config/rootfiles/common/i586/linux | 6 +- config/rootfiles/common/kmod | 13 +++ config/rootfiles/common/module-init-tools | 21 ----- config/rootfiles/common/stage2 | 5 +- config/rootfiles/common/udev | 95 ++++++++++++++-------- config/udev/{blacklist => blacklist.conf} | 0 config/udev/udev.conf | 4 + lfs/dracut | 2 + lfs/{pcre => kmod} | 28 +++++-- lfs/linux | 14 ++-- lfs/mISDN | 4 +- lfs/stage2 | 3 + lfs/udev | 53 ++++++------ make.sh | 2 +- src/initscripts/init.d/udev | 19 ++--- src/initscripts/init.d/udev_retry | 2 +- src/install+setup/libsmooth/netstuff.c | 2 +- src/install+setup/setup/networking.c | 2 + src/patches/dracut-006_add_run_symlink.patch | 13 +++ src/patches/dracut-006_remove_scsi_wait.patch | 12 +++ src/patches/udev-208_remove_systemd_log.patch | 12 +++ 25 files changed, 204 insertions(+), 120 deletions(-) rename config/etc/modprobe.d/{cfg80211 => cfg80211.conf} (100%) rename config/etc/modprobe.d/{pcspeaker => pcspeaker.conf} (100%) create mode 100644 config/rootfiles/common/kmod delete mode 100644 config/rootfiles/common/module-init-tools rename config/udev/{blacklist => blacklist.conf} (100%) create mode 100644 config/udev/udev.conf copy lfs/{pcre => kmod} (87%) create mode 100644 src/patches/dracut-006_add_run_symlink.patch create mode 100644 src/patches/dracut-006_remove_scsi_wait.patch create mode 100644 src/patches/udev-208_remove_systemd_log.patch Difference in files: diff --git a/config/etc/modprobe.d/cfg80211 b/config/etc/modprobe.d/cfg80211 deleted file mode 100644 index e72bedd..0000000 --- a/config/etc/modprobe.d/cfg80211 +++ /dev/null @@ -1 +0,0 @@ -blacklist ieee80211 diff --git a/config/etc/modprobe.d/cfg80211.conf b/config/etc/modprobe.d/cfg80211.conf new file mode 100644 index 0000000..e72bedd --- /dev/null +++ b/config/etc/modprobe.d/cfg80211.conf @@ -0,0 +1 @@ +blacklist ieee80211 diff --git a/config/etc/modprobe.d/pcspeaker b/config/etc/modprobe.d/pcspeaker deleted file mode 100644 index d4e7e94..0000000 --- a/config/etc/modprobe.d/pcspeaker +++ /dev/null @@ -1 +0,0 @@ -blacklist snd_pcsp diff --git a/config/etc/modprobe.d/pcspeaker.conf b/config/etc/modprobe.d/pcspeaker.conf new file mode 100644 index 0000000..d4e7e94 --- /dev/null +++ b/config/etc/modprobe.d/pcspeaker.conf @@ -0,0 +1 @@ +blacklist snd_pcsp diff --git a/config/rootfiles/common/armv5tel/linux b/config/rootfiles/common/armv5tel/linux index 2206ce3..8c4c97f 100644 --- a/config/rootfiles/common/armv5tel/linux +++ b/config/rootfiles/common/armv5tel/linux @@ -1,4 +1,4 @@ -etc/modprobe.d/framebuffer -etc/modprobe.d/ipv6 -etc/modprobe.d/isdn +etc/modprobe.d/framebuffer.conf +etc/modprobe.d/ipv6.conf +etc/modprobe.d/isdn.conf sbin/gen_init_cpio diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 3354d9e..60374aa 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -4,9 +4,9 @@ boot/config-KVER-ipfire-kirkwood boot/dtb-KVER-ipfire-kirkwood boot/uImage-ipfire-kirkwood boot/vmlinuz-KVER-ipfire-kirkwood -etc/modprobe.d/framebuffer -etc/modprobe.d/ipv6 -etc/modprobe.d/isdn +etc/modprobe.d/framebuffer.conf +etc/modprobe.d/ipv6.conf +etc/modprobe.d/isdn.conf lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/build #lib/modules/KVER-ipfire-kirkwood/kernel diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 20b6410..c0c3436 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -3,9 +3,9 @@ boot/System.map-ipfire boot/config-KVER-ipfire boot/vmlinuz-KVER-ipfire boot/vmlinuz-ipfire -etc/modprobe.d/framebuffer -etc/modprobe.d/ipv6 -etc/modprobe.d/isdn +etc/modprobe.d/framebuffer.conf +etc/modprobe.d/ipv6.conf +etc/modprobe.d/isdn.conf lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/build #lib/modules/KVER-ipfire/kernel diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod new file mode 100644 index 0000000..14e7654 --- /dev/null +++ b/config/rootfiles/common/kmod @@ -0,0 +1,13 @@ +bin/kmod +sbin/depmod +sbin/insmod +sbin/lsmod +sbin/modinfo +sbin/modprobe +sbin/rmmod +#usr/include/libkmod.h +#usr/lib/libkmod.la +usr/lib/libkmod.so +usr/lib/libkmod.so.2 +usr/lib/libkmod.so.2.2.3 +#usr/lib/pkgconfig/libkmod.pc diff --git a/config/rootfiles/common/module-init-tools b/config/rootfiles/common/module-init-tools deleted file mode 100644 index 4cffddb..0000000 --- a/config/rootfiles/common/module-init-tools +++ /dev/null @@ -1,21 +0,0 @@ -bin/lsmod -sbin/depmod -sbin/generate-modprobe.conf -sbin/insmod -sbin/insmod.static -sbin/modinfo -sbin/modprobe -sbin/rmmod -#share -#share/man -#share/man/man5 -#share/man/man5/depmod.conf.5 -#share/man/man5/modprobe.conf.5 -#share/man/man5/modules.dep.5 -#share/man/man8 -#share/man/man8/depmod.8 -#share/man/man8/insmod.8 -#share/man/man8/lsmod.8 -#share/man/man8/modinfo.8 -#share/man/man8/modprobe.8 -#share/man/man8/rmmod.8 diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 04ef3f2..a53ecaf 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -20,8 +20,8 @@ etc/ld.so.conf etc/logrotate.conf etc/mime.types etc/modprobe.d -etc/modprobe.d/cfg80211 -etc/modprobe.d/pcspeaker +etc/modprobe.d/cfg80211.conf +etc/modprobe.d/pcspeaker.conf etc/modules.conf etc/mtab etc/nsswitch.conf @@ -132,6 +132,7 @@ usr/share/doc/licenses/GPLv3 #usr/share/misc #usr/share/terminfo #usr/share/zoneinfo +run #var #var/cache var/empty diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev index bacd0cb..3b9979b 100644 --- a/config/rootfiles/common/udev +++ b/config/rootfiles/common/udev @@ -1,71 +1,98 @@ -etc/modprobe.d/blacklist -etc/scsi_id.config +bin/udevadm +etc/modprobe.d/blacklist.conf etc/udev #etc/udev/rules.d #etc/udev/rules.d/30-persistent-network.rules +#etc/udev/rules.d/55-lfs.rules +#etc/udev/rules.d/81-cdrom.rules +#etc/udev/rules.d/83-cdrom-symlinks.rules #etc/udev/udev.conf #lib/firmware -lib/libudev.so.0 -lib/libudev.so.0.2.0 -lib/libvolume_id.so.1 -lib/libvolume_id.so.1.1.0 +lib/libudev.so.1 +lib/libudev.so.1.3.2 lib/udev +#lib/udev/accelerometer #lib/udev/ata_id #lib/udev/cdrom_id #lib/udev/collect -#lib/udev/create_floppy_devices #lib/udev/devices -#lib/udev/devices/core -#lib/udev/devices/fd -#lib/udev/devices/null #lib/udev/devices/pts -#lib/udev/devices/shm -#lib/udev/devices/stderr -#lib/udev/devices/stdin -#lib/udev/devices/stdout -#lib/udev/edd_id #lib/udev/enable_codel -#lib/udev/firmware.sh -#lib/udev/fstab_import -#lib/udev/path_id +#lib/udev/hwdb.d +#lib/udev/hwdb.d/20-OUI.hwdb +#lib/udev/hwdb.d/20-acpi-vendor.hwdb +#lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb +#lib/udev/hwdb.d/20-pci-classes.hwdb +#lib/udev/hwdb.d/20-pci-vendor-model.hwdb +#lib/udev/hwdb.d/20-usb-classes.hwdb +#lib/udev/hwdb.d/20-usb-vendor-model.hwdb +#lib/udev/hwdb.d/60-keyboard.hwdb +#lib/udev/init-net-rules.sh +#lib/udev/mtd_probe #lib/udev/rule_generator.functions #lib/udev/rules.d #lib/udev/rules.d/25-alsa.rules +#lib/udev/rules.d/42-usb-hid-pm.rules #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-keyboard.rules +#lib/udev/rules.d/60-persistent-alsa.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/61-accelerometer.rules +#lib/udev/rules.d/64-btrfs.rules +#lib/udev/rules.d/75-net-description.rules +#lib/udev/rules.d/75-probe_mtd.rules +#lib/udev/rules.d/75-tty-description.rules +#lib/udev/rules.d/78-sound-card.rules #lib/udev/rules.d/80-drivers.rules +#lib/udev/rules.d/80-net-name-slot.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/udevd +#lib/udev/v4l_id #lib/udev/write_cd_rules #lib/udev/write_net_rules sbin/udevadm sbin/udevd #usr/include/libudev.h -#usr/include/libvolume_id.h +#usr/lib/firmware usr/lib/libudev.so -usr/lib/libvolume_id.so #usr/lib/pkgconfig/libudev.pc -#usr/lib/pkgconfig/libvolume_id.pc +#usr/lib/pkgconfig/udev.pc +#usr/share/doc/udev-208 +#usr/share/doc/udev-208/lfs +#usr/share/doc/udev-208/lfs/55-lfs.txt +#usr/share/doc/udev-208/lfs/README +#usr/share/doc/udev-208/libudev-overrides.txt +#usr/share/doc/udev-208/libudev-sections.txt +#usr/share/doc/udev-208/libudev.types +#usr/share/gtk-doc +#usr/share/gtk-doc/html +#usr/share/gtk-doc/html/libudev +#usr/share/gtk-doc/html/libudev/api-index-full.html +#usr/share/gtk-doc/html/libudev/ch01.html +#usr/share/gtk-doc/html/libudev/home.png +#usr/share/gtk-doc/html/libudev/index.html +#usr/share/gtk-doc/html/libudev/index.sgml +#usr/share/gtk-doc/html/libudev/left.png +#usr/share/gtk-doc/html/libudev/libudev-udev-device.html +#usr/share/gtk-doc/html/libudev/libudev-udev-enumerate.html +#usr/share/gtk-doc/html/libudev/libudev-udev-hwdb.html +#usr/share/gtk-doc/html/libudev/libudev-udev-list.html +#usr/share/gtk-doc/html/libudev/libudev-udev-monitor.html +#usr/share/gtk-doc/html/libudev/libudev-udev-queue.html +#usr/share/gtk-doc/html/libudev/libudev-udev-util.html +#usr/share/gtk-doc/html/libudev/libudev-udev.html +#usr/share/gtk-doc/html/libudev/libudev.devhelp2 +#usr/share/gtk-doc/html/libudev/right.png +#usr/share/gtk-doc/html/libudev/style.css +#usr/share/gtk-doc/html/libudev/up.png #usr/share/man/man7/udev.7 -#usr/share/man/man8/ata_id.8 -#usr/share/man/man8/cdrom_id.8 -#usr/share/man/man8/create_floppy_devices.8 -#usr/share/man/man8/edd_id.8 -#usr/share/man/man8/path_id.8 -#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/udev/blacklist b/config/udev/blacklist deleted file mode 100644 index 6b76366..0000000 --- a/config/udev/blacklist +++ /dev/null @@ -1,6 +0,0 @@ -blacklist crc_ccitt -blacklist slhc - -# Intel MEI controllers -# makes some systems hang on reboot -blacklist mei diff --git a/config/udev/blacklist.conf b/config/udev/blacklist.conf new file mode 100644 index 0000000..6b76366 --- /dev/null +++ b/config/udev/blacklist.conf @@ -0,0 +1,6 @@ +blacklist crc_ccitt +blacklist slhc + +# Intel MEI controllers +# makes some systems hang on reboot +blacklist mei diff --git a/config/udev/udev.conf b/config/udev/udev.conf new file mode 100644 index 0000000..31bb662 --- /dev/null +++ b/config/udev/udev.conf @@ -0,0 +1,4 @@ +# The initial syslog(3) priority: "err", "info", "debug" or its +# numerical equivalent. For runtime debugging, the daemons internal +# state can be changed with: "udevadm control --log-priority=<value>". +udev_log="err" diff --git a/lfs/dracut b/lfs/dracut index d486950..7b0cd8a 100644 --- a/lfs/dracut +++ b/lfs/dracut @@ -73,6 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_lzma.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_cdrom_wait.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_add_run_symlink.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_scsi_wait.patch cd $(DIR_APP) && cp -vf $(DIR_SRC)/src/dracut/switch_root.c . diff --git a/lfs/kmod b/lfs/kmod new file mode 100644 index 0000000..dc2dc10 --- /dev/null +++ b/lfs/kmod @@ -0,0 +1,94 @@ +############################################################################### +# # +# 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 = 13 + +THISAPP = kmod-$(VER) +DL_FILE = $(THISAPP).tar.xz +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 = d5aba43b9370cd52f3cb35e82a1aa595 + +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 axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --bindir=/bin \ + --sysconfdir=/etc \ + --enable-zlib \ + --disable-manpages + +# --libdir=/lib \ + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + # Create symlinks + ln -svf ../bin/kmod /sbin/modprobe + ln -svf ../bin/kmod /sbin/modinfo + ln -svf ../bin/kmod /sbin/insmod + ln -svf ../bin/kmod /sbin/rmmod + ln -svf ../bin/kmod /sbin/depmod + ln -svf ../bin/kmod /sbin/lsmod + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/linux b/lfs/linux index 5fc9e1f..306a1d1 100644 --- a/lfs/linux +++ b/lfs/linux @@ -230,25 +230,25 @@ ifeq "$(LASTKERNEL)" "1" cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/ # Blacklist matroxfb_base - echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer + echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer.conf # Blacklist old framebuffer modules for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \ done # Blacklist new drm framebuffer modules for f in $$(ls -1 /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm/*/*.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \ done - sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer + sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf # Blacklist isdn modules for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn.conf ; \ done - sed -i -e "s|.ko||g" /etc/modprobe.d/isdn + sed -i -e "s|.ko||g" /etc/modprobe.d/isdn.conf # Disable ipv6 at runtime - echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6 + echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf endif # Disable geode_aes modul if exist diff --git a/lfs/mISDN b/lfs/mISDN index e6a7465..5cd4972 100644 --- a/lfs/mISDN +++ b/lfs/mISDN @@ -106,9 +106,9 @@ endif ifneq "$(XEN)" "1" # Blacklist misdn modules for f in $$(find /lib/modules/$(KVER)-$(VERSUFIX)/mISDN -name *.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/mISDN ; \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/mISDN.conf ; \ done - sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN + sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN.conf endif # Remove mISDN modules that was shipped with the kernel diff --git a/lfs/stage2 b/lfs/stage2 index 5c15f41..3c4a8e4 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -111,6 +111,9 @@ $(TARGET) : chgrp -v utmp /var/run/utmp /var/log/lastlog chmod -v 664 /var/run/utmp /var/log/lastlog + # Create /run symlink + ln -s /var/run /run + # Permissions chmod 0711 /var/empty diff --git a/lfs/udev b/lfs/udev index 9ebec2f..d034993 100644 --- a/lfs/udev +++ b/lfs/udev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 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,23 +24,26 @@ include Config -VER = 141 +VER = 208 THISAPP = udev-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = systemd-$(VER).tar.xz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) +DIR_APP = $(DIR_SRC)/systemd-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) udev-lfs-208-1.tar.bz2 + $(DL_FILE) = $(DL_FROM)/$(DL_FILE) +udev-lfs-$(VER)-1.tar.bz2 = $(DL_FROM)/udev-lfs-$(VER)-1.tar.bz2 -$(DL_FILE)_MD5 = 1670fe81cabf5161319c52084cf81134 +$(DL_FILE)_MD5 = df64550d92afbffb4f67a434193ee165 +udev-lfs-$(VER)-1.tar.bz2_MD5 = 67a5339e7ef1fa08f5db8315a5ea69e7 install : $(TARGET) @@ -70,32 +73,36 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @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 + cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(VER)-1.tar.bz2 + + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208_remove_systemd_log.patch +# cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-141_no_netif_rename.patch + + cd $(DIR_APP)/udev-lfs-$(VER)-1 && sed -i "s/HANDLE_AT 1/HANDLE_AT 0/g" cfg.h + rm -rf /lib/udev/devices - install -dv /lib/{firmware,udev/devices/{pts,shm}} - 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 + install -dv /lib/firmware + + cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs $(MAKETUNING) + cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs install + + # Make some compat symlinks + ln -sf /lib/udev/udevd /sbin/udevd + ln -sf /sbin/udevadm /bin/udevadm # Disable net generator rule. This does not work with the setup. rm -f /lib/udev/rules.d/75-persistent-net-generator.rules + rm -f /lib/udev/rules.d/80-net-name-slot.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 + cp -vf $(DIR_SRC)/config/udev/blacklist.conf /etc/modprobe.d/blacklist.conf + + # Install config file + install -v -m 644 $(DIR_SRC)/config/udev/udev.conf \ + /etc/udev/ # Install alsa rules. install -v -m 644 $(DIR_SRC)/config/udev/25-alsa.rules \ diff --git a/make.sh b/make.sh index 849624e..dea4290 100755 --- a/make.sh +++ b/make.sh @@ -360,7 +360,7 @@ buildbase() { lfsmake2 make lfsmake2 man lfsmake2 mktemp - lfsmake2 module-init-tools + lfsmake2 kmod lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev index 03846e6..72d1e40 100644 --- a/src/initscripts/init.d/udev +++ b/src/initscripts/init.d/udev @@ -17,6 +17,9 @@ case "${1}" in start) + boot_mesg "Mount /var/run..." + mount -n -t tmpfs tmpfs /var/run -o size=2M + boot_mesg "Populating /dev with device nodes..." if ! grep -q '[[:space:]]sysfs' /proc/mounts; then echo_failure @@ -29,16 +32,10 @@ case "${1}" in read ENTER /etc/rc.d/init.d/halt stop fi - - # Mount a temporary file system over /dev, so that any devices - # made or removed during this boot don't affect the next one. - # The reason we don't write to mtab is because we don't ever - # want /dev to be unavailable (such as by `umount -a'). - mount -n -t tmpfs tmpfs /dev -o mode=755 - if [ ${?} != 0 ]; then + if ! grep -q '[[:space:]]/dev' /proc/mounts; then echo_failure - boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE} - boot_mesg -n " onto /dev, this system will be halted." + boot_mesg -n "FAILURE:\n\nKernel has no devtmpfs/mount" ${FAILURE} + boot_mesg -n " support but this is needed for udev." boot_mesg -n "\n\nAfter you press Enter, this system" boot_mesg -n " will be halted and powered off." boot_mesg -n "\n\nPress Enter to continue..." ${INFO} @@ -60,10 +57,10 @@ case "${1}" in # Now traverse /sys in order to "coldplug" devices that have # already been discovered - /sbin/udevadm trigger + /bin/udevadm trigger # Now wait for udevd to process the uevents we triggered - /sbin/udevadm settle + /bin/udevadm settle evaluate_retval ;; diff --git a/src/initscripts/init.d/udev_retry b/src/initscripts/init.d/udev_retry index 78461ce..25e6967 100644 --- a/src/initscripts/init.d/udev_retry +++ b/src/initscripts/init.d/udev_retry @@ -26,7 +26,7 @@ case "${1}" in done 2>/dev/null # Now wait for udevd to process the uevents we triggered - /sbin/udevadm settle + /bin/udevadm settle evaluate_retval ;; diff --git a/src/install+setup/libsmooth/netstuff.c b/src/install+setup/libsmooth/netstuff.c index 1c6eb42..8c6f3fa 100644 --- a/src/install+setup/libsmooth/netstuff.c +++ b/src/install+setup/libsmooth/netstuff.c @@ -532,7 +532,7 @@ int create_udev(void) for (i = 0 ; i < 4 ; i++) { if (strcmp(knics[i].macaddr, "")) { - fprintf(fp,"ACTION==\"add\", SUBSYSTEM==\"net\", SYSFS{type}==\"1\", SYSFS{address}==\"%s\", NAME=\"%s0\" # %s\n", knics[i].macaddr, lcolourcard[i], knics[i].description); + fprintf(fp,"\n# %s\nACTION==\"add\", SUBSYSTEM==\"net\", ATTR{type}==\"1\", ATTR{address}==\"%s\", NAME=\"%s0\"\n", knics[i].description, knics[i].macaddr, lcolourcard[i]); } } fclose(fp); diff --git a/src/install+setup/setup/networking.c b/src/install+setup/setup/networking.c index 9c13717..edd3c71 100644 --- a/src/install+setup/setup/networking.c +++ b/src/install+setup/setup/networking.c @@ -112,6 +112,8 @@ int handlenetworking(void) runcommandwithstatus("/etc/rc.d/init.d/network start", ctr[TR_PULLING_NETWORK_UP]); } + } else { + rename_nics(); } create_udev(); return 1; diff --git a/src/patches/dracut-006_add_run_symlink.patch b/src/patches/dracut-006_add_run_symlink.patch new file mode 100644 index 0000000..abe029f --- /dev/null +++ b/src/patches/dracut-006_add_run_symlink.patch @@ -0,0 +1,13 @@ +diff -Naur dracut-006.org/modules.d/99base/init dracut-006/modules.d/99base/init +--- dracut-006.org/modules.d/99base/init 2010-06-17 10:46:29.000000000 +0200 ++++ dracut-006/modules.d/99base/init 2013-10-31 16:51:17.658771341 +0100 +@@ -87,6 +87,9 @@ + + ln -s /proc/self/fd /dev/fd >/dev/null 2>&1 + ++# Add run symlink ++ln -s /var/run /run ++ + if getarg rdinitdebug; then + getarg quiet && DRACUT_QUIET="yes" + mkfifo /dev/initlog.pipe diff --git a/src/patches/dracut-006_remove_scsi_wait.patch b/src/patches/dracut-006_remove_scsi_wait.patch new file mode 100644 index 0000000..cfccf01 --- /dev/null +++ b/src/patches/dracut-006_remove_scsi_wait.patch @@ -0,0 +1,12 @@ +diff -Naur dracut-006.org/modules.d/99base/init dracut-006/modules.d/99base/init +--- dracut-006.org/modules.d/99base/init 2010-06-17 10:46:29.000000000 +0200 ++++ dracut-006/modules.d/99base/init 2013-10-31 17:05:09.135475525 +0100 +@@ -175,7 +175,7 @@ + + $UDEV_QUEUE_EMPTY >/dev/null 2>&1 || continue + +- modprobe scsi_wait_scan && rmmod scsi_wait_scan ++ sleep 0.1 + + $UDEV_QUEUE_EMPTY >/dev/null 2>&1 || continue + diff --git a/src/patches/udev-208_remove_systemd_log.patch b/src/patches/udev-208_remove_systemd_log.patch new file mode 100644 index 0000000..927de1e --- /dev/null +++ b/src/patches/udev-208_remove_systemd_log.patch @@ -0,0 +1,12 @@ +diff -Naur systemd-208.org/src/libudev/libudev-util.c systemd-208/src/libudev/libudev-util.c +--- systemd-208.org/src/libudev/libudev-util.c 2013-09-23 21:31:55.000000000 +0200 ++++ systemd-208/src/libudev/libudev-util.c 2013-11-19 23:18:10.326350131 +0100 +@@ -481,7 +481,7 @@ + if (fd < 0) + return -errno; + +- len = snprintf(text, sizeof(text), "<30>systemd-udevd[%u]: ", getpid()); ++ len = snprintf(text, sizeof(text), "udevd[%u]: ", getpid()); + + va_start(ap, fmt); + len += vsnprintf(text + len, sizeof(text) - len, fmt, ap); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e2fedc9a47aa92b1572f26aeca78da2f922400c7
by git＠ipfire.org 18 Nov '13

18 Nov '13

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 e2fedc9a47aa92b1572f26aeca78da2f922400c7 (commit) from 1a386bb9d8765a04651f54348d0d1e01d9950235 (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 e2fedc9a47aa92b1572f26aeca78da2f922400c7 Author: Ersan Yildirim <yakazan(a)gmail.com> Date: Mon Nov 18 11:39:51 2013 +0100 Updates for Turkish translation. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.tr | 89 +++---------------------------------------- langs/tr/cgi-bin/tr.pl | 101 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 101 insertions(+), 89 deletions(-) Difference in files: diff --git a/doc/language_issues.tr b/doc/language_issues.tr index d58bcc3..d1d655a 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -437,6 +437,12 @@ WARNING: translation string unused: to email adr WARNING: translation string unused: to install an update WARNING: translation string unused: to warn email bad WARNING: translation string unused: too long 80 char max +WARNING: translation string unused: tor accounting period daily +WARNING: translation string unused: tor accounting period monthly +WARNING: translation string unused: tor accounting period weekly +WARNING: translation string unused: tor bridge enabled +WARNING: translation string unused: tor errmsg invalid node id +WARNING: translation string unused: tor exit country WARNING: translation string unused: traffic back WARNING: translation string unused: traffic calc time WARNING: translation string unused: traffic calc time bad @@ -512,13 +518,6 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy errmsg proxy ports equal WARNING: untranslated string: advproxy proxy port transparent WARNING: untranslated string: bytes -WARNING: untranslated string: dnsforward -WARNING: untranslated string: dnsforward add a new entry -WARNING: untranslated string: dnsforward configuration -WARNING: untranslated string: dnsforward edit an entry -WARNING: untranslated string: dnsforward entries -WARNING: untranslated string: dnsforward forward_server -WARNING: untranslated string: dnsforward zone WARNING: untranslated string: least preferred WARNING: untranslated string: most preferred WARNING: untranslated string: new @@ -527,82 +526,6 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table -WARNING: untranslated string: tor -WARNING: untranslated string: tor accounting -WARNING: untranslated string: tor accounting bytes -WARNING: untranslated string: tor accounting bytes left -WARNING: untranslated string: tor accounting interval -WARNING: untranslated string: tor accounting limit -WARNING: untranslated string: tor accounting period -WARNING: untranslated string: tor acls -WARNING: untranslated string: tor allowed subnets -WARNING: untranslated string: tor bandwidth burst -WARNING: untranslated string: tor bandwidth rate -WARNING: untranslated string: tor bandwidth settings -WARNING: untranslated string: tor bandwidth unlimited -WARNING: untranslated string: tor common settings -WARNING: untranslated string: tor configuration -WARNING: untranslated string: tor connected relays -WARNING: untranslated string: tor contact info -WARNING: untranslated string: tor daemon WARNING: untranslated string: tor directory port -WARNING: untranslated string: tor enabled -WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid directory port -WARNING: untranslated string: tor errmsg invalid ip or mask -WARNING: untranslated string: tor errmsg invalid relay address -WARNING: untranslated string: tor errmsg invalid relay name -WARNING: untranslated string: tor errmsg invalid relay port -WARNING: untranslated string: tor errmsg invalid socks port -WARNING: untranslated string: tor exit country any -WARNING: untranslated string: tor exit nodes -WARNING: untranslated string: tor relay address -WARNING: untranslated string: tor relay configuration -WARNING: untranslated string: tor relay enabled -WARNING: untranslated string: tor relay external address -WARNING: untranslated string: tor relay fingerprint -WARNING: untranslated string: tor relay mode -WARNING: untranslated string: tor relay mode bridge -WARNING: untranslated string: tor relay mode exit -WARNING: untranslated string: tor relay mode private bridge -WARNING: untranslated string: tor relay mode relay -WARNING: untranslated string: tor relay nickname -WARNING: untranslated string: tor relay port -WARNING: untranslated string: tor service -WARNING: untranslated string: tor socks port -WARNING: untranslated string: tor stats -WARNING: untranslated string: tor traffic limit hard -WARNING: untranslated string: tor traffic limit soft -WARNING: untranslated string: tor traffic read written -WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: urlfilter redirect template -WARNING: untranslated string: wlan client -WARNING: untranslated string: wlan client advanced settings -WARNING: untranslated string: wlan client and -WARNING: untranslated string: wlan client bssid -WARNING: untranslated string: wlan client ccmp -WARNING: untranslated string: wlan client configuration -WARNING: untranslated string: wlan client disconnected -WARNING: untranslated string: wlan client duplicate ssid -WARNING: untranslated string: wlan client edit entry -WARNING: untranslated string: wlan client encryption -WARNING: untranslated string: wlan client encryption none -WARNING: untranslated string: wlan client encryption wep -WARNING: untranslated string: wlan client encryption wpa -WARNING: untranslated string: wlan client encryption wpa2 -WARNING: untranslated string: wlan client group cipher -WARNING: untranslated string: wlan client group key algorithm -WARNING: untranslated string: wlan client invalid key length -WARNING: untranslated string: wlan client new entry -WARNING: untranslated string: wlan client new network -WARNING: untranslated string: wlan client pairwise cipher -WARNING: untranslated string: wlan client pairwise key algorithm -WARNING: untranslated string: wlan client pairwise key group key -WARNING: untranslated string: wlan client psk -WARNING: untranslated string: wlan client ssid -WARNING: untranslated string: wlan client tkip -WARNING: untranslated string: wlan client wpa mode -WARNING: untranslated string: wlan client wpa mode all -WARNING: untranslated string: wlan client wpa mode ccmp ccmp -WARNING: untranslated string: wlan client wpa mode ccmp tkip -WARNING: untranslated string: wlan client wpa mode tkip tkip diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 9888121..2589668 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -737,6 +737,13 @@ 'dns saved txt' => 'Girilen iki DNS sunucu adresi başarılı bir şekilde kaydedildi. Değişikliklerin aktifleştirielebilmesi için yeniden başlatın!', 'dns server' => 'DNS Sunucusu', 'dns title' => 'Etki Alanı Ad Sistemi', +'dnsforward' => 'DNS yönlendirmesi', +'dnsforward add a new entry' => 'Yeni bir kayıt ekle:', +'dnsforward configuration' => 'İleri DNS yapılandırması', +'dnsforward edit an entry' => 'Varolan bir kaydı düzenle:', +'dnsforward entries' => 'Güncel kayıtlar:', +'dnsforward forward_server' => 'Ad sunucusu', +'dnsforward zone' => 'Bölge', 'do not log this port list' => 'Otorumdan hemen önce bu bağlantı noktaları listesini bırak (günlük boyutunu küçültür)', 'dod' => 'Çevirmeli Bağlantı Üzerinden Talep', 'dod for dns' => 'DNS için çevirmeli bağlantı üzerinden talep:', @@ -751,7 +758,7 @@ 'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif', 'donation-text' => 'IPFire boş zamanlarında gönüllüer tarafından geliştirlmektedir. Bu projeyi ayakta tutmak için eğer bize destek olmak isterseniz küçük bir bağıştan mutluluk duyarız.', 'done' => 'Yap', -'dos charset' => 'DOS Karakter', +'dos charset' => 'DOS Karakterleri', 'down and up speed' => 'Gönderme hızı düştüğünde Kaydet düğmesine basın.', 'downlink speed' => 'İndirme bağlantı hızı (kbit/san)', 'downlink std class' => 'Standart indirme bağlantısı sınıfı', @@ -1586,9 +1593,9 @@ 'reload' => 'yeniden yükle', 'remark' => 'Açıklama', 'remark title' => 'Açıklama:', -'remote access' => 'Uzaktan erişim', -'remote announce' => 'Uzaktan Duyuru', -'remote browse sync' => 'Remote Browse Sync', +'remote access' => 'Uzak erişim', +'remote announce' => 'Uzak duyuru', +'remote browse sync' => 'Uzak tarayıcı eşitlemesi', 'remote host/ip' => 'Uzak ana bilgisayar/IP', 'remote logging' => 'Uzak günlük', 'remote subnet' => 'Uzak alt ağ:', @@ -1824,6 +1831,58 @@ 'tone' => 'Ses', 'tone dial' => 'Sesli çevirme:', 'too long 80 char max' => ' çok uzun, izin verilen en fazla 80 karakterdir', +'tor' => 'Tor', +'tor accounting' => 'Hesap', +'tor accounting bytes' => 'Trafik (okuma/yazma)', +'tor accounting bytes left' => 'left', +'tor accounting interval' => 'Aralık (UTC)', +'tor accounting limit' => 'Hesap sınırı (MB)', +'tor accounting period' => 'Hesap dönemi', +'tor accounting period daily' => 'günlük', +'tor accounting period monthly' => 'aylık', +'tor accounting period weekly' => 'haftalık', +'tor acls' => 'Erişim Kontrolü', +'tor allowed subnets' => 'İzin verilen alt ağlar (her satırda bir tane)', +'tor bandwidth burst' => 'En büyük ayırma', +'tor bandwidth rate' => 'En büyük oran', +'tor bandwidth settings' => 'Bant Genişliği Ayarları', +'tor bandwidth unlimited' => 'sınırsız', +'tor bridge enabled' => 'Tor köprüsünü etkinleştir', +'tor common settings' => 'Genel Ayarlar', +'tor configuration' => 'Tor Yapılandırması', +'tor connected relays' => 'Bağlı aktarımlar', +'tor contact info' => 'İletişim Bilgileri', +'tor daemon' => 'Artalan süreci', +'tor enabled' => 'Tor Aktif', +'tor errmsg invalid accounting limit' => 'Geçersiz hesap sınırı', +'tor errmsg invalid ip or mask' => 'Geçersiz IP alt ağı', +'tor errmsg invalid node id' => 'Geçersiz düğüm kimliği (ID)', +'tor errmsg invalid relay address' => 'Geçersiz aktarma adresi', +'tor errmsg invalid relay name' => 'Geçersiz aktarma takma adı', +'tor errmsg invalid relay port' => 'Geçersiz aktarma bağlantı noktası', +'tor errmsg invalid socks port' => 'Geçersiz SOCKS bağlantı noktası', +'tor exit country' => 'Ülçe çıkışı', +'tor exit country any' => 'Herhangi bir ülke', +'tor exit nodes' => 'Çıkış Düğümleri', +'tor relay address' => 'Aktarma adresleri', +'tor relay configuration' => 'Tor Aktarma Yapılandırması', +'tor relay enabled' => 'Tor Aktarma Aktif', +'tor relay external address' => 'Aktarım dış adresi', +'tor relay fingerprint' => 'Aktarım parmak izi', +'tor relay mode' => 'Aktarım biçimi', +'tor relay mode bridge' => 'Köprü', +'tor relay mode exit' => 'Çıkış-Düğümü', +'tor relay mode private bridge' => 'Özel köprü', +'tor relay mode relay' => 'Sadece aktarım', +'tor relay nickname' => 'Aktarım takma adı', +'tor relay port' => 'Aktarım bağlantı noktası', +'tor service' => 'Tor Servisi', +'tor socks port' => 'SOCKS bağlantı noktası', +'tor stats' => 'İstatistik', +'tor traffic limit hard' => 'Trafik sınırına ulaşıldı.', +'tor traffic limit soft' => 'Trafik sınırına neredeyse ulaşıldı. Yeni herhangi bir bağlantı kabul edilmiyor.', +'tor traffic read written' => 'Toplam tarfik (okuma/yazma)', +'tor use exit nodes' => 'Sadece bu çıkış düğümlerini kullanın (her satıra bir tane)', 'total connection time' => 'Toplam bağlantı süresi', 'total hits for log section' => 'Günlük bölümü için toplam kayıt', 'traffic back' => 'Geri', @@ -1933,7 +1992,7 @@ 'updxlrtr save and restart' => 'Kaydet ve Yeniden Başlat', 'updxlrtr source' => 'Kaynak', 'updxlrtr source checkup' => 'Kaynak kontrolü', -'updxlrtr source checkup schedule' => 'Kaynak kontrolü programı', +'updxlrtr source checkup schedule' => 'Kaynak kontrol zamanı', 'updxlrtr sources' => 'Kaynaklar', 'updxlrtr standard view' => 'Standart görünüm', 'updxlrtr statistics' => 'İstatistik', @@ -2066,7 +2125,7 @@ 'urlfilter hourly' => 'Saatlik', 'urlfilter import blacklist' => 'Kara listeyi al', 'urlfilter import text' => 'Önceden kaydedilmiş *.tar.gz uzantılı kara liste düzenleyici dosyasını yüklemek için aşağıdan seçin', -'urlfilter install blacklist' => 'Kara listeyi kur', +'urlfilter install blacklist' => 'Kara listeye yükle', 'urlfilter install information' => 'Yeni kara liste otomatik olarak oluşturulup veritabanları için derlenecektir. Kara liste boyutuna bağlı olarak güncelleme işlemi birkaç dakika zaman alabilir. URL filtreyi yeniden başlatmadan önce bu görevin muhakkak bitirilmesini bekleyin.', 'urlfilter invalid content' => 'Dosya squidGuard uyumlu kara liste değil', 'urlfilter invalid import file' => 'Dosya geçerli URL filtre kara liste düzenleyicisi dosyası değil', @@ -2247,6 +2306,36 @@ 'wireless config added' => 'Kablosuz ağ yapılandırma eklendi', 'wireless config changed' => 'Kablosuz ağ yapılandırma değiştirildi', 'wireless configuration' => 'Kablosuz Ağ ayarları', +'wlan client' => 'Kablosuz istemci', +'wlan client advanced settings' => 'Gelişmiş ayarlar', +'wlan client and' => 've', +'wlan client bssid' => 'BSSID', +'wlan client ccmp' => 'CCMP', +'wlan client configuration' => 'Kablosuz isdemci Yapılandırması', +'wlan client disconnected' => 'Bağlantı kesildi', +'wlan client duplicate ssid' => 'Yinelenen SSID', +'wlan client edit entry' => 'Kablosuz istemci yapılandırmasını düzenle', +'wlan client encryption' => 'Şifreleme', +'wlan client encryption none' => 'Hiçbiri', +'wlan client encryption wep' => 'WEP', +'wlan client encryption wpa' => 'WPA', +'wlan client encryption wpa2' => 'WPA2', +'wlan client group cipher' => 'Grup şifreleme', +'wlan client group key algorithm' => 'GKA', +'wlan client invalid key length' => 'Geçersiz anahtar uzunluğu.', +'wlan client new entry' => 'Yeni kablosuz istemci yapılandırması oluştur', +'wlan client new network' => 'Yeni ağ', +'wlan client pairwise cipher' => 'İkili şifreleme', +'wlan client pairwise key algorithm' => 'PKA', +'wlan client pairwise key group key' => 'İkili anahtar/grup anahtarı', +'wlan client psk' => 'Önceden paylaşılan anahtar', +'wlan client ssid' => 'SSID', +'wlan client tkip' => 'TKIP', +'wlan client wpa mode' => 'WPA biçimi', +'wlan client wpa mode all' => 'Otomatik', +'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP', +'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP', +'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', 'wlanap access point' => 'Erişim Noktası', 'wlanap channel' => 'Kanal', 'wlanap country' => 'Ülke Kodu', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 1ee33ddadf2737588ea50326bbc5995e93864aa3
by git＠ipfire.org 17 Nov '13

17 Nov '13

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, fifteen has been updated via 1ee33ddadf2737588ea50326bbc5995e93864aa3 (commit) from 6ee9053548341eceba9e0126a8e903872384a961 (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 1ee33ddadf2737588ea50326bbc5995e93864aa3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Nov 17 18:51:04 2013 +0100 util-linux: update to 2.24. this is needed for newer udev versions but need some initskript changes. The updater and arm rootfile is not finished yet. ----------------------------------------------------------------------- Summary of changes: config/etc/fstab | 4 - config/etc/inittab | 2 +- config/rootfiles/common/i586/util-linux | 232 ++++++++++++++---- lfs/util-linux | 16 +- make.sh | 2 +- src/initscripts/init.d/mountfs | 7 +- src/initscripts/init.d/partresize | 9 +- src/patches/util-linux-2.12r-cramfs-1.patch | 93 ------- .../util-linux-2.12r-umount-no-special.patch | 11 - src/patches/util-linux-buildfix.patch | 272 --------------------- 10 files changed, 205 insertions(+), 443 deletions(-) delete mode 100644 src/patches/util-linux-2.12r-cramfs-1.patch delete mode 100644 src/patches/util-linux-2.12r-umount-no-special.patch delete mode 100644 src/patches/util-linux-buildfix.patch Difference in files: diff --git a/config/etc/fstab b/config/etc/fstab index 4860d6f..805ed4b 100644 --- a/config/etc/fstab +++ b/config/etc/fstab @@ -5,10 +5,6 @@ DEVICE1 /boot ext2 defaults 1 2 DEVICE2 swap swap pri=1 0 0 DEVICE3 / FSTYPE defaults 1 1 DEVICE4 /var FSTYPE defaults 1 1 -proc /proc proc defaults 0 0 -sysfs /sys sysfs defaults 0 0 -devpts /dev/pts devpts gid=4,mode=620 0 0 -#none /tmp tmpfs defaults 0 0 none /var/log/rrd tmpfs defaults,size=64M 0 0 none /var/lock tmpfs defaults,size=8M 0 0 none /var/run tmpfs defaults,size=2M 0 0 diff --git a/config/etc/inittab b/config/etc/inittab index ea5ae99..5f7d0a6 100644 --- a/config/etc/inittab +++ b/config/etc/inittab @@ -19,7 +19,7 @@ ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now su:S016:once:/sbin/sulogin -1:2345:respawn:/sbin/agetty tty1 9600 +1:2345:respawn:/sbin/agetty tty1 9600 --noclear 2:2345:respawn:/sbin/agetty tty2 9600 3:2345:respawn:/sbin/agetty tty3 9600 4:2345:respawn:/sbin/agetty tty4 9600 diff --git a/config/rootfiles/common/i586/util-linux b/config/rootfiles/common/i586/util-linux index f0a2b2b..7ab118a 100644 --- a/config/rootfiles/common/i586/util-linux +++ b/config/rootfiles/common/i586/util-linux @@ -1,17 +1,25 @@ -#bin/arch bin/dmesg +bin/findmnt +bin/lsblk bin/more bin/mount bin/umount -etc/fdprm +bin/wdctl +lib/libblkid.so.1.1.0 +lib/libmount.so.1 +lib/libmount.so.1.1.0 +lib/libuuid.so.1.3.0 sbin/agetty +sbin/blkdiscard sbin/blockdev sbin/cfdisk +sbin/chcpu sbin/ctrlaltdel -#sbin/elvtune sbin/fdisk #sbin/fsck.cramfs sbin/fsck.minix +sbin/fsfreeze +sbin/fstrim sbin/hwclock sbin/losetup sbin/mkfs @@ -19,50 +27,161 @@ sbin/mkfs #sbin/mkfs.cramfs sbin/mkfs.minix sbin/mkswap +sbin/nologin #sbin/pivot_root +sbin/raw sbin/sfdisk +sbin/swaplabel sbin/swapoff sbin/swapon +sbin/switch_root +sbin/wipefs #usr/bin/cal -#usr/bin/chkdupexe +#usr/bin/chrt #usr/bin/col #usr/bin/colcrt #usr/bin/colrm #usr/bin/column #usr/bin/cytune -#usr/bin/ddate -usr/bin/fdformat +usr/bin/eject +usr/bin/fallocate usr/bin/flock usr/bin/getopt #usr/bin/hexdump +#usr/bin/i386 +usr/bin/ionice +#usr/bin/ipcmk #usr/bin/ipcrm #usr/bin/ipcs #usr/bin/isosize -#usr/bin/line +#usr/bin/linux32 +#usr/bin/linux64 usr/bin/logger #usr/bin/look +usr/bin/lscpu +usr/bin/lslocks #usr/bin/mcookie #usr/bin/namei +#usr/bin/nsenter usr/bin/pg -#usr/bin/raw +usr/bin/prlimit usr/bin/rename usr/bin/renice #usr/bin/rev #usr/bin/script -#usr/bin/setfdprm +#usr/bin/scriptreplay +#usr/bin/setarch #usr/bin/setsid #usr/bin/setterm #usr/bin/tailf +#usr/bin/taskset #usr/bin/ul +#usr/bin/unshare #usr/bin/whereis -#usr/bin/write -#usr/sbin/ramsize -usr/sbin/rdev +#usr/include/libmount +#usr/include/libmount/libmount.h +#usr/lib/libblkid.la +#usr/lib/libmount.a +#usr/lib/libmount.la +#usr/lib/libmount.so +#usr/lib/libuuid.la +#usr/lib/pkgconfig/mount.pc +usr/sbin/addpart +usr/sbin/delpart +usr/sbin/fdformat +usr/sbin/ldattach +usr/sbin/partx #usr/sbin/readprofile -#usr/sbin/rootflags -#usr/sbin/tunelp -#usr/sbin/vidmode -#usr/share/info/ipc.info +usr/sbin/resizepart +usr/sbin/rtcwake +usr/share/bash-completion +#usr/share/bash-completion/completions +#usr/share/bash-completion/completions/addpart +#usr/share/bash-completion/completions/blkdiscard +#usr/share/bash-completion/completions/blkid +#usr/share/bash-completion/completions/blockdev +#usr/share/bash-completion/completions/cal +#usr/share/bash-completion/completions/cfdisk +#usr/share/bash-completion/completions/chcpu +#usr/share/bash-completion/completions/chrt +#usr/share/bash-completion/completions/col +#usr/share/bash-completion/completions/colcrt +#usr/share/bash-completion/completions/colrm +#usr/share/bash-completion/completions/column +#usr/share/bash-completion/completions/ctrlaltdel +#usr/share/bash-completion/completions/cytune +#usr/share/bash-completion/completions/delpart +#usr/share/bash-completion/completions/dmesg +#usr/share/bash-completion/completions/eject +#usr/share/bash-completion/completions/fallocate +#usr/share/bash-completion/completions/fdformat +#usr/share/bash-completion/completions/fdisk +#usr/share/bash-completion/completions/findmnt +#usr/share/bash-completion/completions/flock +#usr/share/bash-completion/completions/fsck +#usr/share/bash-completion/completions/fsck.cramfs +#usr/share/bash-completion/completions/fsck.minix +#usr/share/bash-completion/completions/fsfreeze +#usr/share/bash-completion/completions/fstrim +#usr/share/bash-completion/completions/getopt +#usr/share/bash-completion/completions/hexdump +#usr/share/bash-completion/completions/hwclock +#usr/share/bash-completion/completions/ionice +#usr/share/bash-completion/completions/ipcrm +#usr/share/bash-completion/completions/ipcs +#usr/share/bash-completion/completions/isosize +#usr/share/bash-completion/completions/ldattach +#usr/share/bash-completion/completions/logger +#usr/share/bash-completion/completions/look +#usr/share/bash-completion/completions/losetup +#usr/share/bash-completion/completions/lsblk +#usr/share/bash-completion/completions/lscpu +#usr/share/bash-completion/completions/lslocks +#usr/share/bash-completion/completions/mcookie +#usr/share/bash-completion/completions/mesg +#usr/share/bash-completion/completions/mkfs +#usr/share/bash-completion/completions/mkfs.bfs +#usr/share/bash-completion/completions/mkfs.cramfs +#usr/share/bash-completion/completions/mkfs.minix +#usr/share/bash-completion/completions/mkswap +#usr/share/bash-completion/completions/more +#usr/share/bash-completion/completions/mountpoint +#usr/share/bash-completion/completions/namei +#usr/share/bash-completion/completions/nsenter +#usr/share/bash-completion/completions/partx +#usr/share/bash-completion/completions/pg +#usr/share/bash-completion/completions/pivot_root +#usr/share/bash-completion/completions/prlimit +#usr/share/bash-completion/completions/raw +#usr/share/bash-completion/completions/readprofile +#usr/share/bash-completion/completions/rename +#usr/share/bash-completion/completions/renice +#usr/share/bash-completion/completions/resizepart +#usr/share/bash-completion/completions/rev +#usr/share/bash-completion/completions/rtcwake +#usr/share/bash-completion/completions/script +#usr/share/bash-completion/completions/scriptreplay +#usr/share/bash-completion/completions/setarch +#usr/share/bash-completion/completions/setsid +#usr/share/bash-completion/completions/setterm +#usr/share/bash-completion/completions/sfdisk +#usr/share/bash-completion/completions/swaplabel +#usr/share/bash-completion/completions/swapon +#usr/share/bash-completion/completions/tailf +#usr/share/bash-completion/completions/taskset +#usr/share/bash-completion/completions/ul +#usr/share/bash-completion/completions/unshare +#usr/share/bash-completion/completions/utmpdump +#usr/share/bash-completion/completions/uuidd +#usr/share/bash-completion/completions/uuidgen +#usr/share/bash-completion/completions/wall +#usr/share/bash-completion/completions/wdctl +#usr/share/bash-completion/completions/whereis +#usr/share/bash-completion/completions/wipefs +#usr/share/doc/util-linux +#usr/share/doc/util-linux/getopt +#usr/share/doc/util-linux/getopt/getopt-parse.bash +#usr/share/doc/util-linux/getopt/getopt-parse.tcsh #usr/share/locale/ca/LC_MESSAGES/util-linux.mo #usr/share/locale/cs/LC_MESSAGES/util-linux.mo #usr/share/locale/da/LC_MESSAGES/util-linux.mo @@ -71,12 +190,21 @@ usr/sbin/rdev #usr/share/locale/et #usr/share/locale/et/LC_MESSAGES #usr/share/locale/et/LC_MESSAGES/util-linux.mo +#usr/share/locale/eu +#usr/share/locale/eu/LC_MESSAGES +#usr/share/locale/eu/LC_MESSAGES/util-linux.mo #usr/share/locale/fi/LC_MESSAGES/util-linux.mo #usr/share/locale/fr/LC_MESSAGES/util-linux.mo +#usr/share/locale/gl/LC_MESSAGES/util-linux.mo +#usr/share/locale/hr/LC_MESSAGES/util-linux.mo +#usr/share/locale/hu/LC_MESSAGES/util-linux.mo +#usr/share/locale/id/LC_MESSAGES/util-linux.mo #usr/share/locale/it/LC_MESSAGES/util-linux.mo #usr/share/locale/ja/LC_MESSAGES/util-linux.mo #usr/share/locale/nl/LC_MESSAGES/util-linux.mo +#usr/share/locale/pl/LC_MESSAGES/util-linux.mo #usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo +#usr/share/locale/ru/LC_MESSAGES/util-linux.mo #usr/share/locale/sl #usr/share/locale/sl/LC_MESSAGES #usr/share/locale/sl/LC_MESSAGES/util-linux.mo @@ -85,72 +213,92 @@ usr/sbin/rdev #usr/share/locale/uk #usr/share/locale/uk/LC_MESSAGES #usr/share/locale/uk/LC_MESSAGES/util-linux.mo -#usr/share/man/man1/arch.1 +#usr/share/locale/vi/LC_MESSAGES/util-linux.mo +#usr/share/locale/zh_CN/LC_MESSAGES/util-linux.mo +#usr/share/locale/zh_TW/LC_MESSAGES/util-linux.mo #usr/share/man/man1/cal.1 -#usr/share/man/man1/chkdupexe.1 +#usr/share/man/man1/chrt.1 #usr/share/man/man1/col.1 #usr/share/man/man1/colcrt.1 #usr/share/man/man1/colrm.1 #usr/share/man/man1/column.1 -#usr/share/man/man1/ddate.1 +#usr/share/man/man1/dmesg.1 +#usr/share/man/man1/eject.1 +#usr/share/man/man1/fallocate.1 #usr/share/man/man1/flock.1 #usr/share/man/man1/getopt.1 #usr/share/man/man1/hexdump.1 -#usr/share/man/man1/line.1 +#usr/share/man/man1/ionice.1 +#usr/share/man/man1/ipcmk.1 +#usr/share/man/man1/ipcrm.1 +#usr/share/man/man1/ipcs.1 #usr/share/man/man1/look.1 +#usr/share/man/man1/lscpu.1 #usr/share/man/man1/mcookie.1 #usr/share/man/man1/more.1 #usr/share/man/man1/namei.1 +#usr/share/man/man1/nsenter.1 #usr/share/man/man1/pg.1 -#usr/share/man/man1/readprofile.1 +#usr/share/man/man1/prlimit.1 #usr/share/man/man1/rename.1 +#usr/share/man/man1/renice.1 #usr/share/man/man1/rev.1 #usr/share/man/man1/script.1 +#usr/share/man/man1/scriptreplay.1 +#usr/share/man/man1/setsid.1 #usr/share/man/man1/setterm.1 #usr/share/man/man1/tailf.1 +#usr/share/man/man1/taskset.1 #usr/share/man/man1/ul.1 +#usr/share/man/man1/unshare.1 #usr/share/man/man1/whereis.1 -#usr/share/man/man1/write.1 +#usr/share/man/man3/uuid_generate_time_safe.3 #usr/share/man/man5/fstab.5 -#usr/share/man/man5/nfs.5 +#usr/share/man/man8/addpart.8 #usr/share/man/man8/agetty.8 +#usr/share/man/man8/blkdiscard.8 #usr/share/man/man8/blockdev.8 #usr/share/man/man8/cfdisk.8 +#usr/share/man/man8/chcpu.8 #usr/share/man/man8/ctrlaltdel.8 #usr/share/man/man8/cytune.8 -#usr/share/man/man8/dmesg.8 -#usr/share/man/man8/elvtune.8 +#usr/share/man/man8/delpart.8 #usr/share/man/man8/fdformat.8 #usr/share/man/man8/fdisk.8 +#usr/share/man/man8/findmnt.8 +#usr/share/man/man8/fsck.cramfs.8 #usr/share/man/man8/fsck.minix.8 +#usr/share/man/man8/fsfreeze.8 +#usr/share/man/man8/fstrim.8 #usr/share/man/man8/hwclock.8 -#usr/share/man/man8/ipcrm.8 -#usr/share/man/man8/ipcs.8 +#usr/share/man/man8/i386.8 #usr/share/man/man8/isosize.8 +#usr/share/man/man8/ldattach.8 +#usr/share/man/man8/linux32.8 +#usr/share/man/man8/linux64.8 #usr/share/man/man8/losetup.8 +#usr/share/man/man8/lsblk.8 +#usr/share/man/man8/lslocks.8 #usr/share/man/man8/mkfs.8 #usr/share/man/man8/mkfs.bfs.8 +#usr/share/man/man8/mkfs.cramfs.8 #usr/share/man/man8/mkfs.minix.8 #usr/share/man/man8/mkswap.8 #usr/share/man/man8/mount.8 +#usr/share/man/man8/nologin.8 +#usr/share/man/man8/partx.8 #usr/share/man/man8/pivot_root.8 -#usr/share/man/man8/ramsize.8 #usr/share/man/man8/raw.8 -#usr/share/man/man8/rdev.8 -#usr/share/man/man8/renice.8 -#usr/share/man/man8/rootflags.8 -#usr/share/man/man8/setfdprm.8 -#usr/share/man/man8/setsid.8 +#usr/share/man/man8/readprofile.8 +#usr/share/man/man8/resizepart.8 +#usr/share/man/man8/rtcwake.8 +#usr/share/man/man8/setarch.8 #usr/share/man/man8/sfdisk.8 -#usr/share/man/man8/sln.8 +#usr/share/man/man8/swaplabel.8 #usr/share/man/man8/swapoff.8 #usr/share/man/man8/swapon.8 -#usr/share/man/man8/tunelp.8 +#usr/share/man/man8/switch_root.8 #usr/share/man/man8/umount.8 -#usr/share/man/man8/vidmode.8 -#usr/share/misc/getopt -#usr/share/misc/getopt/getopt-parse.bash -#usr/share/misc/getopt/getopt-parse.tcsh -#usr/share/misc/getopt/getopt-test.bash -#usr/share/misc/getopt/getopt-test.tcsh -var/lib/hwclock +#usr/share/man/man8/wdctl.8 +#usr/share/man/man8/wipefs.8 + diff --git a/lfs/util-linux b/lfs/util-linux index a394166..40f371b 100644 --- a/lfs/util-linux +++ b/lfs/util-linux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 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,10 +24,10 @@ include Config -VER = 2.12r +VER = 2.24 THISAPP = util-linux-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = af9d9e03038481fbf79ea3ac33f116f9 +$(DL_FILE)_MD5 = 4fac6443427f575fc5f3531a4ad2ca01 install : $(TARGET) @@ -69,13 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/util-linux-2.12r-umount-no-special.patch - cd $(DIR_APP) && sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \ - hwclock/hwclock.c - -mkdir -p /var/lib/hwclock - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-cramfs-1.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/util-linux-buildfix.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure cd $(DIR_APP) && make $(MAKETUNING) HAVE_KILL=yes HAVE_SLN=yes cd $(DIR_APP) && make HAVE_KILL=yes HAVE_SLN=yes install diff --git a/make.sh b/make.sh index 0101bb0..849624e 100755 --- a/make.sh +++ b/make.sh @@ -369,8 +369,8 @@ buildbase() { lfsmake2 sysvinit lfsmake2 tar lfsmake2 texinfo - lfsmake2 udev lfsmake2 util-linux + lfsmake2 udev lfsmake2 vim lfsmake2 xz lfsmake2 paxctl diff --git a/src/initscripts/init.d/mountfs b/src/initscripts/init.d/mountfs index d4735d5..284b51d 100644 --- a/src/initscripts/init.d/mountfs +++ b/src/initscripts/init.d/mountfs @@ -24,11 +24,9 @@ case "${1}" in # Remove fsck-related file system watermarks. rm -f /fastboot /forcefsck - boot_mesg "Recording existing mounts in /etc/mtab..." + boot_mesg "Create /etc/mtab..." > /etc/mtab mount -f / || failed=1 - mount -f /proc || failed=1 - mount -f /sys || failed=1 (exit ${failed}) evaluate_retval @@ -49,9 +47,6 @@ case "${1}" in boot_mesg "Unmounting all other currently mounted file systems..." umount -a -d -r &>/dev/null evaluate_retval - - # mount /sys again for led control at halt - mount /sys 2>&1 >/dev/null ;; *) echo "Usage: ${0} {start|stop}" diff --git a/src/initscripts/init.d/partresize b/src/initscripts/init.d/partresize index 33b5626..d4e4db2 100644 --- a/src/initscripts/init.d/partresize +++ b/src/initscripts/init.d/partresize @@ -6,7 +6,7 @@ # # Authors : Arne Fitzenreiter - arne_f(a)ipfire.org # -# Version : 1.01 +# Version : 1.02 # # Notes : # @@ -22,6 +22,12 @@ case "${1}" in mount -o remount,rw / > /dev/null evaluate_retval + boot_mesg "Create /etc/mtab..." + > /etc/mtab + mount -f / || failed=1 + (exit ${failed}) + evaluate_retval + # Detect device ROOT=`mount | grep -m1 " / " | cut -d" " -f1`; if [ "${ROOT:`expr length $ROOT`-2:1}" == "p" ]; then @@ -49,4 +55,3 @@ case "${1}" in esac # End $rc_base/init.d/partresize - diff --git a/src/patches/util-linux-2.12r-cramfs-1.patch b/src/patches/util-linux-2.12r-cramfs-1.patch deleted file mode 100644 index b8366b3..0000000 --- a/src/patches/util-linux-2.12r-cramfs-1.patch +++ /dev/null @@ -1,93 +0,0 @@ -Submitted by: Jeremy Utley <jeremy(a)linuxfromscratch.org> -Date: 2004-12-25 -Initial Package Version: 2.12p (should apply to versions back to at least k) -Upstream Status: Not Submitted - Test Version -Origin: Alexander Patrakov, adapted from debian build of cramfs utilities -Description: Util-Linux fails in cramfs compilation due to changes in the -linux-libc-headers package 2.6.9 and after. This patch is a proper fix to the -problem, but may in fact not be accepted upstream. - - -diff -Naur util-linux-2.12p/disk-utils/fsck.cramfs.c util-linux-2.12p-new/disk-utils/fsck.cramfs.c ---- util-linux-2.12p/disk-utils/fsck.cramfs.c 2004-12-11 14:53:16.000000000 +0000 -+++ util-linux-2.12p-new/disk-utils/fsck.cramfs.c 2004-12-26 00:53:10.665199086 +0000 -@@ -76,16 +76,7 @@ - - #define PAD_SIZE 512 - --#include <asm/page.h> --#ifdef PAGE_SIZE --#define PAGE_CACHE_SIZE ((int) PAGE_SIZE) --#elif defined __ia64__ --#define PAGE_CACHE_SIZE (16384) --#elif defined __alpha__ --#define PAGE_CACHE_SIZE (8192) --#else --#define PAGE_CACHE_SIZE (4096) --#endif -+#define PAGE_CACHE_SIZE page_size - - /* Guarantee access to at least 8kB at a time */ - #define ROMBUFFER_BITS 13 -@@ -95,11 +86,13 @@ - static unsigned long read_buffer_block = ~0UL; - - /* Uncompressing data structures... */ --static char outbuffer[PAGE_CACHE_SIZE*2]; -+static char *outbuffer; - z_stream stream; - - #endif /* INCLUDE_FS_TESTS */ - -+static size_t page_size; -+ - /* Input status of 0 to print help and exit without an error. */ - static void usage(int status) - { -@@ -464,9 +457,17 @@ - int c; /* for getopt */ - int start = 0; - -+ page_size = sysconf(_SC_PAGESIZE); -+ - if (argc) - progname = argv[0]; - -+ outbuffer = malloc(page_size * 2); -+ if (!outbuffer) { -+ fprintf(stderr, _("failed to allocate outbuffer\n")); -+ exit(8); -+ } -+ - /* command line options */ - while ((c = getopt(argc, argv, "hx:v")) != EOF) { - switch (c) { -diff -Naur util-linux-2.12p/disk-utils/mkfs.cramfs.c util-linux-2.12p-new/disk-utils/mkfs.cramfs.c ---- util-linux-2.12p/disk-utils/mkfs.cramfs.c 2004-12-11 14:56:01.000000000 +0000 -+++ util-linux-2.12p-new/disk-utils/mkfs.cramfs.c 2004-12-26 00:53:10.666198928 +0000 -@@ -46,16 +46,8 @@ - static const char *progname = "mkcramfs"; - static int verbose = 0; - --#ifdef __ia64__ --#define PAGE_CACHE_SIZE (16384) --#elif defined __alpha__ --#define PAGE_CACHE_SIZE (8192) --#else --#define PAGE_CACHE_SIZE (4096) --#endif -- - /* The kernel assumes PAGE_CACHE_SIZE as block size. */ --static unsigned int blksize = PAGE_CACHE_SIZE; /* settable via -b option */ -+static unsigned int blksize; /* settable via -b option */ - static long total_blocks = 0, total_nodes = 1; /* pre-count the root node */ - static int image_length = 0; - -@@ -730,6 +722,7 @@ - u32 crc = crc32(0L, Z_NULL, 0); - int c; - -+ blksize = sysconf(_SC_PAGESIZE); - total_blocks = 0; - - if (argc) { diff --git a/src/patches/util-linux-2.12r-umount-no-special.patch b/src/patches/util-linux-2.12r-umount-no-special.patch deleted file mode 100644 index d79598f..0000000 --- a/src/patches/util-linux-2.12r-umount-no-special.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- util-linux-2.12r.old/mount/umount.c -+++ util-linux-2.12r/mount/umount.c -@@ -31,7 +31,7 @@ - #include <arpa/inet.h> - #endif - --#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__) -+#if defined(MNT_FORCE) - /* Interesting ... it seems libc knows about MNT_FORCE and presumably - about umount2 as well -- need not do anything */ - #else /* MNT_FORCE */ diff --git a/src/patches/util-linux-buildfix.patch b/src/patches/util-linux-buildfix.patch deleted file mode 100644 index 3d578e4..0000000 --- a/src/patches/util-linux-buildfix.patch +++ /dev/null @@ -1,272 +0,0 @@ -Submitted By: Dan Nicholson <dbn_dot_lists_at_gmail_dot_com> -Date: 2006-07-08 -Initial Package Version: 2.12r -Origin: Upstream -Upstream Status: Applied in util-linux-2.13-pre6.tar.bz2 -Description: Replaces uses of *llseek with lseek. Fixes an issue - compiling util-linux with kernel headers from linux-2.6.18-rc1 - headers_install. - -diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/Makefile util-linux-2.12r/fdisk/Makefile ---- util-linux-2.12r.orig/fdisk/Makefile 2004-09-06 20:28:58.000000000 +0000 -+++ util-linux-2.12r/fdisk/Makefile 2006-07-08 15:40:57.140375072 +0000 -@@ -39,7 +39,7 @@ else - endif - endif - --cfdisk: cfdisk.o llseek.o disksize.o i386_sys_types.o $(LIB)/xstrncpy.o -+cfdisk: cfdisk.o disksize.o i386_sys_types.o $(LIB)/xstrncpy.o - ifeq "$(HAVE_SLANG)" "yes" - $(CC) $(LDFLAGS) $^ -o $@ $(LIBSLANG) - else -@@ -55,7 +55,7 @@ activate: sfdisk - rm -f activate - ln -s sfdisk activate - --fdisk: fdisk.o llseek.o disksize.o fdiskbsdlabel.o fdisksgilabel.o \ -+fdisk: fdisk.o disksize.o fdiskbsdlabel.o fdisksgilabel.o \ - fdisksunlabel.o fdiskaixlabel.o i386_sys_types.o partname.o - fdisk.o: fdisk.c fdisk.h - fdiskbsdlabel.o: fdiskbsdlabel.c fdisk.h fdiskbsdlabel.h -diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/cfdisk.c util-linux-2.12r/fdisk/cfdisk.c ---- util-linux-2.12r.orig/fdisk/cfdisk.c 2005-09-09 21:44:57.000000000 +0000 -+++ util-linux-2.12r/fdisk/cfdisk.c 2006-07-08 15:40:23.458901045 +0000 -@@ -84,9 +84,6 @@ - #include "xstrncpy.h" - #include "common.h" - --extern long long ext2_llseek(unsigned int fd, long long offset, -- unsigned int origin); -- - #define VERSION UTIL_LINUX_VERSION - - #define DEFAULT_DEVICE "/dev/hda" -@@ -552,7 +549,7 @@ die_x(int ret) { - - static void - read_sector(char *buffer, long long sect_num) { -- if (ext2_llseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0) -+ if (lseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0) - fatal(_("Cannot seek on disk drive"), 2); - if (read(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE) - fatal(_("Cannot read disk drive"), 2); -@@ -560,7 +557,7 @@ read_sector(char *buffer, long long sect - - static void - write_sector(char *buffer, long long sect_num) { -- if (ext2_llseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0) -+ if (lseek(fd, sect_num*SECTOR_SIZE, SEEK_SET) < 0) - fatal(_("Cannot seek on disk drive"), 2); - if (write(fd, buffer, SECTOR_SIZE) != SECTOR_SIZE) - fatal(_("Cannot write disk drive"), 2); -@@ -587,7 +584,7 @@ get_dos_label(int i) { - long long offset; - - offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE; -- if (ext2_llseek(fd, offset, SEEK_SET) == offset -+ if (lseek(fd, offset, SEEK_SET) == offset - && read(fd, &sector, sizeof(sector)) == sizeof(sector)) { - dos_copy_to_info(p_info[i].ostype, OSTYPESZ, - sector+DOS_OSTYPE_OFFSET, DOS_OSTYPE_SZ); -@@ -672,7 +669,7 @@ get_linux_label(int i) { - - offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE - + 1024; -- if (ext2_llseek(fd, offset, SEEK_SET) == offset -+ if (lseek(fd, offset, SEEK_SET) == offset - && read(fd, &e2fsb, sizeof(e2fsb)) == sizeof(e2fsb) - && e2fsb.s_magic[0] + (e2fsb.s_magic[1]<<8) == EXT2_SUPER_MAGIC) { - label = e2fsb.s_volume_name; -@@ -688,7 +685,7 @@ get_linux_label(int i) { - } - - offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE + 0; -- if (ext2_llseek(fd, offset, SEEK_SET) == offset -+ if (lseek(fd, offset, SEEK_SET) == offset - && read(fd, &xfsb, sizeof(xfsb)) == sizeof(xfsb) - && !strncmp(xfsb.s_magic, XFS_SUPER_MAGIC, 4)) { - label = xfsb.s_fname; -@@ -702,7 +699,7 @@ get_linux_label(int i) { - /* jfs? */ - offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE - + JFS_SUPER1_OFF; -- if (ext2_llseek(fd, offset, SEEK_SET) == offset -+ if (lseek(fd, offset, SEEK_SET) == offset - && read(fd, &jfsb, sizeof(jfsb)) == sizeof(jfsb) - && !strncmp(jfsb.s_magic, JFS_MAGIC, strlen(JFS_MAGIC))) { - label = jfsb.s_label; -@@ -716,7 +713,7 @@ get_linux_label(int i) { - /* reiserfs? */ - offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE - + REISERFS_DISK_OFFSET_IN_BYTES; -- if (ext2_llseek(fd, offset, SEEK_SET) == offset -+ if (lseek(fd, offset, SEEK_SET) == offset - && read(fd, &reiserfsb, sizeof(reiserfsb)) == sizeof(reiserfsb) - && has_reiserfs_magic_string(&reiserfsb, &reiserfs_is_3_6)) { - if (reiserfs_is_3_6) { -@@ -1860,7 +1857,7 @@ write_part_table(void) { - - while (!done) { - mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, -- _("Are you sure you want write the partition table " -+ _("Are you sure you want to write the partition table " - "to disk? (yes or no): ")); - len = get_string(response, LINE_LENGTH, NULL); - clear_warning(); -diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdisk.c util-linux-2.12r/fdisk/fdisk.c ---- util-linux-2.12r.orig/fdisk/fdisk.c 2004-12-18 02:00:31.000000000 +0000 -+++ util-linux-2.12r/fdisk/fdisk.c 2006-07-08 15:40:23.461899841 +0000 -@@ -239,8 +239,8 @@ void fatal(enum failure why) { - - static void - seek_sector(int fd, unsigned int secno) { -- long long offset = (long long) secno * sector_size; -- if (ext2_llseek(fd, offset, SEEK_SET) == (long long) -1) -+ off_t offset = (off_t) secno * sector_size; -+ if (lseek(fd, offset, SEEK_SET) == (off_t) -1) - fatal(unable_to_seek); - } - -diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdisk.h util-linux-2.12r/fdisk/fdisk.h ---- util-linux-2.12r.orig/fdisk/fdisk.h 2004-12-15 18:19:06.000000000 +0000 -+++ util-linux-2.12r/fdisk/fdisk.h 2006-07-08 15:40:23.462899439 +0000 -@@ -26,9 +26,6 @@ - #define cround(n) (display_in_cyl_units ? ((n)/units_per_sector)+1 : (n)) - #define scround(x) (((x)+units_per_sector-1)/units_per_sector) - --extern long long ext2_llseek(unsigned int fd, long long offset, -- unsigned int origin); -- - #if defined(__GNUC__) && (defined(__arm__) || defined(__alpha__)) - # define PACKED __attribute__ ((packed)) - #else -diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdiskbsdlabel.c util-linux-2.12r/fdisk/fdiskbsdlabel.c ---- util-linux-2.12r.orig/fdisk/fdiskbsdlabel.c 2003-07-13 21:12:47.000000000 +0000 -+++ util-linux-2.12r/fdisk/fdiskbsdlabel.c 2006-07-08 15:40:23.463899038 +0000 -@@ -566,7 +566,7 @@ xbsd_write_bootstrap (void) - sector = get_start_sect(xbsd_part); - #endif - -- if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE, SEEK_SET) == -1) -+ if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1) - fatal (unable_to_seek); - if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE)) - fatal (unable_to_write); -@@ -735,7 +735,7 @@ xbsd_readlabel (struct partition *p, str - sector = 0; - #endif - -- if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE, SEEK_SET) == -1) -+ if (lseek (fd, (off_t) sector * SECTOR_SIZE, SEEK_SET) == -1) - fatal (unable_to_seek); - if (BSD_BBSIZE != read (fd, disklabelbuffer, BSD_BBSIZE)) - fatal (unable_to_read); -@@ -781,12 +781,12 @@ xbsd_writelabel (struct partition *p, st - - #if defined (__alpha__) && BSD_LABELSECTOR == 0 - alpha_bootblock_checksum (disklabelbuffer); -- if (ext2_llseek (fd, (long long) 0, SEEK_SET) == -1) -+ if (lseek (fd, (off_t) 0, SEEK_SET) == -1) - fatal (unable_to_seek); - if (BSD_BBSIZE != write (fd, disklabelbuffer, BSD_BBSIZE)) - fatal (unable_to_write); - #else -- if (ext2_llseek (fd, (long long) sector * SECTOR_SIZE + BSD_LABELOFFSET, -+ if (lseek (fd, (off_t) sector * SECTOR_SIZE + BSD_LABELOFFSET, - SEEK_SET) == -1) - fatal (unable_to_seek); - if (sizeof (struct xbsd_disklabel) != write (fd, d, sizeof (struct xbsd_disklabel))) -diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/fdisksgilabel.c util-linux-2.12r/fdisk/fdisksgilabel.c ---- util-linux-2.12r.orig/fdisk/fdisksgilabel.c 2004-12-18 01:53:45.000000000 +0000 -+++ util-linux-2.12r/fdisk/fdisksgilabel.c 2006-07-08 15:40:23.464898637 +0000 -@@ -379,7 +379,7 @@ sgi_write_table(void) { - */ - sgiinfo *info = fill_sgiinfo(); - int infostartblock = SSWAP32(sgilabel->directory[0].vol_file_start); -- if (ext2_llseek(fd, (long long)infostartblock* -+ if (lseek(fd, (off_t) infostartblock* - SECTOR_SIZE, SEEK_SET) < 0) - fatal(unable_to_seek); - if (write(fd, info, SECTOR_SIZE) != SECTOR_SIZE) -diff -pur -x '*.rej' util-linux-2.12r.orig/fdisk/sfdisk.c util-linux-2.12r/fdisk/sfdisk.c ---- util-linux-2.12r.orig/fdisk/sfdisk.c 2005-01-04 22:31:57.000000000 +0000 -+++ util-linux-2.12r/fdisk/sfdisk.c 2006-07-08 15:40:23.467897432 +0000 -@@ -164,36 +164,17 @@ fatal(char *s, ...) { - /* - * sseek: seek to specified sector - return 0 on failure - * -- * For >4GB disks lseek needs a > 32bit arg, and we have to use llseek. -- * On the other hand, a 32 bit sector number is OK until 2TB. -- * The routines _llseek and sseek below are the only ones that -- * know about the loff_t type. -- * - * Note: we use 512-byte sectors here, irrespective of the hardware ss. - */ --#undef use_lseek --#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__) --#define use_lseek --#endif -- --#ifndef use_lseek --static __attribute__used --_syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo, -- loff_t *, res, unsigned int, wh); --#endif - - static int - sseek(char *dev, unsigned int fd, unsigned long s) { -- loff_t in, out; -- in = ((loff_t) s << 9); -+ off_t in, out; -+ in = ((off_t) s << 9); - out = 1; - --#ifndef use_lseek -- if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0) { --#else - if ((out = lseek(fd, in, SEEK_SET)) != in) { --#endif -- perror("llseek"); -+ perror("lseek"); - error(_("seek error on %s - cannot seek to %lu\n"), dev, s); - return 0; - } -diff -pur -x '*.rej' util-linux-2.12r.orig/partx/partx.c util-linux-2.12r/partx/partx.c ---- util-linux-2.12r.orig/partx/partx.c 2004-08-23 20:13:27.000000000 +0000 -+++ util-linux-2.12r/partx/partx.c 2006-07-08 15:40:23.469896630 +0000 -@@ -330,34 +330,15 @@ xmalloc (size_t size) { - return t; - } - --/* -- * sseek: seek to specified sector -- */ --#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__) && !defined(__x86_64__) --#define NEED__llseek --#endif -- --#ifdef NEED__llseek --#include <linux/unistd.h> /* _syscall */ --static --_syscall5(int, _llseek, uint, fd, ulong, hi, ulong, lo, -- long long *, res, uint, wh); --#endif -- - static int - sseek(int fd, unsigned int secnr) { - long long in, out; - in = ((long long) secnr << 9); - out = 1; - --#ifdef NEED__llseek -- if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0 -- || out != in) --#else - if ((out = lseek(fd, in, SEEK_SET)) != in) --#endif - { -- fprintf(stderr, "llseek error\n"); -+ fprintf(stderr, "lseek error\n"); - return -1; - } - return 0; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 6ee9053548341eceba9e0126a8e903872384a961
by git＠ipfire.org 14 Nov '13

14 Nov '13

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, fifteen has been updated via 6ee9053548341eceba9e0126a8e903872384a961 (commit) via 1187d46e65e9938fab90fb463a8c3ee15e4a646a (commit) via 9659f59a86ebe76e860370cb7480198ea4323e71 (commit) from 6f0fd5e1789e59ec1aad25bea560494c5750a4b9 (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 6ee9053548341eceba9e0126a8e903872384a961 Author: Alexander Marx <amarx(a)ipfire.org> Date: Wed Nov 13 10:44:42 2013 +0100 Firewall: Fixed portfw-converter (rules where not converted correctly) And Standard network "IPsec RW" now has brackets around the Ip (when set) commit 1187d46e65e9938fab90fb463a8c3ee15e4a646a Merge: 9659f59 6f0fd5e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 14 11:41:18 2013 +0100 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen commit 9659f59a86ebe76e860370cb7480198ea4323e71 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 14 11:40:36 2013 +0100 configroot: Fix recursively including /var/ipfire/backup. This issue has been introduced in a72fac88. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 6 +++--- config/firewall/convert-portfw | 23 +++++++++++++++-------- config/rootfiles/common/configroot | 6 +++--- 3 files changed, 21 insertions(+), 14 deletions(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 778a39b..9d9ee5d 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -100,9 +100,9 @@ sub setup_default_networks my ($ip,$sub) = split(/\//,$ipsecsettings{'RW_NET'}); $sub=&General::iporsubtocidr($sub); my @tempipsecsubnet = split("\/", $ipsecsettings{'RW_NET'}); - $defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'ADR'} = $tempipsecsubnet[0]; - $defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'NAME'} = "IPsec RW"; - $defaultNetworks->{'IPsec RW ' .$ip."/".$sub}{'NET'} = &getnextip($ip); + $defaultNetworks->{'IPsec RW (' .$ip."/".$sub.")"}{'ADR'} = $tempipsecsubnet[0]; + $defaultNetworks->{'IPsec RW (' .$ip."/".$sub.")"}{'NAME'} = "IPsec RW"; + $defaultNetworks->{'IPsec RW (' .$ip."/".$sub.")"}{'NET'} = &getnextip($ip); } } } diff --git a/config/firewall/convert-portfw b/config/firewall/convert-portfw index f6ddd25..447ef90 100755 --- a/config/firewall/convert-portfw +++ b/config/firewall/convert-portfw @@ -107,9 +107,9 @@ sub build_rules $active = uc $active; $prot = uc $prot; chomp($remark); - push (@built_rules,"ACCEPT,FORWARDFW,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat"); + push (@built_rules,"ACCEPT,FORWARDFW,$active,$src,$src1,tgt_addr,$target/32,,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat"); my $now=localtime; - print LOG "$now Converted-> KEY: $count ACCEPT,FORWARDFW,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat\n"; + print LOG "$now Converted-> KEY: $count ACCEPT,FORWARDFW,$active,$src,$src1,tgt_addr,$target/32,*,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat\n"; } } sub write_rules @@ -120,15 +120,22 @@ sub write_rules &General::readhasharray($confignat,\%nat); foreach my $line (@built_rules){ $skip=''; - my ($action,$chain,$active,$src,$src1,$tgt,$tgt1,$use_prot,$prot,$dummy,$tgt_port,$tgt_port1,$remark,$from,$to,$use_port,$alias,$ipfireport,$dnat) = split (",",$line); + my ($action,$chain,$active,$src,$src1,$tgt,$tgt1,$dummy,$prot,$dummy,$tgt_port,$tgt_port1,$remark,$from,$to,$use_port,$alias,$ipfireport,$dnat) = split (",",$line); foreach my $key (sort keys %nat){ - if ($line eq "$nat{$key}[0],$nat{$key}[1],$nat{$key}[2],$nat{$key}[3],$nat{$key}[4],$nat{$key}[5],$nat{$key}[6],$nat{$key}[11],$nat{$key}[12],$nat{$key}[13],$nat{$key}[14],$nat{$key}[15],$nat{$key}[16],$nat{$key}[26],$nat{$key}[27],$nat{$key}[28],$nat{$key}[29],$nat{$key}[30],$nat{$key}[31]"){ + if ($line eq "$nat{$key}[0],$nat{$key}[1],$nat{$key}[2],$nat{$key}[3],$nat{$key}[4],$nat{$key}[5],$nat{$key}[6],$nat{$key}[7],$nat{$key}[8],$nat{$key}[11],$nat{$key}[14],$nat{$key}[15],$nat{$key}[16],$nat{$key}[26],$nat{$key}[27],$nat{$key}[28],$nat{$key}[29],$nat{$key}[30],$nat{$key}[31]"){ my $now=localtime; - print LOG "$now SKIP-> Rule $nat{$key}[0],$nat{$key}[1],$nat{$key}[2],$nat{$key}[3],$nat{$key}[4],$nat{$key}[5],$nat{$key}[6],$nat{$key}[11],$nat{$key}[12],$nat{$key}[13],$nat{$key}[14],$nat{$key}[15],$nat{$key}[16],$nat{$key}[26],$nat{$key}[27],$nat{$key}[28],$nat{$key}[29],$nat{$key}[30],$nat{$key}[31] ->EXISTS\n"; + print LOG "$now SKIP-> Rule $nat{$key}[0],$nat{$key}[1],$nat{$key}[2],$nat{$key}[3],$nat{$key}[4],$nat{$key}[5],$nat{$key}[6],$nat{$key}[7],$nat{$key}[8],$nat{$key}[11],$nat{$key}[14],$nat{$key}[15],$nat{$key}[16],$nat{$key}[26],$nat{$key}[27],$nat{$key}[28],$nat{$key}[29],$nat{$key}[30],$nat{$key}[31] ->EXISTS\n"; $skip='1'; } } if ($skip ne '1'){ + if ( $prot eq 'GRE'){ + $tgt_port=''; + $tgt_port1=''; + $use_port=''; + $ipfireport=''; + $use_prot=''; + } $id = &General::findhasharraykey(\%nat); $nat{$id}[0] = $action; $nat{$id}[1] = $chain; @@ -137,9 +144,9 @@ sub write_rules $nat{$id}[4] = $src1; $nat{$id}[5] = $tgt; $nat{$id}[6] = $tgt1; - $nat{$id}[11] = $use_prot; - $nat{$id}[12] = $prot; - $nat{$id}[13] = $dummy; + $nat{$id}[7] = $dummy; + $nat{$id}[8] = $prot; + $nat{$id}[11] = $use_port; $nat{$id}[14] = $tgt_port; $nat{$id}[15] = $tgt_port1; $nat{$id}[16] = $remark; diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 795bdb1..087443a 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -7,9 +7,9 @@ usr/sbin/firewall-policy var/ipfire/addon-lang var/ipfire/auth #var/ipfire/auth/users -var/ipfire/backup -#var/ipfire/backup/exclude.user -#var/ipfire/backup/include.user +#var/ipfire/backup +var/ipfire/backup/exclude.user +var/ipfire/backup/include.user var/ipfire/ca var/ipfire/certs #var/ipfire/certs/index.txt hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM