IPFire-SCM September 2016

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 829435bea3eee286cd1b1c73a81d53fcd0336c07
by git＠ipfire.org 27 Sep '16

27 Sep '16

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 829435bea3eee286cd1b1c73a81d53fcd0336c07 (commit) from 3cf764f338da36c28b348c46db1dbbdff8c97d5b (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 829435bea3eee286cd1b1c73a81d53fcd0336c07 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 27 20:15:53 2016 +0200 ntp: fix wait for red if dhcp or wpasupplicant is running. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/106/filelists/files | 1 + src/initscripts/init.d/ntp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files index 02b9d4c..fdd8f89 100644 --- a/config/rootfiles/core/106/filelists/files +++ b/config/rootfiles/core/106/filelists/files @@ -4,6 +4,7 @@ etc/rc.d/init.d/dhcp etc/rc.d/init.d/network etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders +etc/rc.d/init.d/ntp etc/rc.d/init.d/unbound etc/rc.d/rc0.d/K79unbound etc/rc.d/rc3.d/S21unbound diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp index a746c1e..d411ba1 100644 --- a/src/initscripts/init.d/ntp +++ b/src/initscripts/init.d/ntp @@ -10,7 +10,8 @@ case "$1" in start) if [ "$ENABLESETONBOOT" == "on" ]; then boot_mesg -n "Setting time on boot..." - if [ $(pidof wpa_supplicant dhcpcd) ]; then + pidof wpa_supplicant dhcpcd 2>&1 > /dev/null + if [ "${?}" == "0" ]; then if [ ! -e /var/ipfire/red/active ]; then boot_mesg "" boot_mesg -n "Waiting for red connection" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3cf764f338da36c28b348c46db1dbbdff8c97d5b
by git＠ipfire.org 27 Sep '16

27 Sep '16

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 3cf764f338da36c28b348c46db1dbbdff8c97d5b (commit) from b547554aea406f99740eeee8c31584708a4f000f (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 3cf764f338da36c28b348c46db1dbbdff8c97d5b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 27 19:38:38 2016 +0200 samba: default enable SMBv2. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/samba.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 0e1409c..696cb1b 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -101,7 +101,7 @@ $sambasettings{'DISPLAYCHARSET'} = 'CP850'; $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; -$sambasettings{'SMB2'} = 'off'; +$sambasettings{'SMB2'} = 'on'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; ### Samba CUPS Variablen @@ -185,7 +185,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; - $sambasettings{'SMB2'} = 'off'; + $sambasettings{'SMB2'} = 'on'; $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; system("/usr/local/bin/sambactrl smbreload"); refreshpage(); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b547554aea406f99740eeee8c31584708a4f000f
by git＠ipfire.org 27 Sep '16

27 Sep '16

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 b547554aea406f99740eeee8c31584708a4f000f (commit) via dee3be75f908e083f865f6275b4f2ce7692d0f26 (commit) from 92aebbcddd16a0969ab5c2f5fcd4d7217a68e3e4 (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 b547554aea406f99740eeee8c31584708a4f000f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 27 19:20:14 2016 +0200 core106: ship mt7601u firmware. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit dee3be75f908e083f865f6275b4f2ce7692d0f26 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 27 18:39:53 2016 +0200 mpfr: fix missing eof in rootfile. this is the reason for missing mt7601u firmware. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/mpfr | 2 +- config/rootfiles/{oldcore/100 => core/106}/filelists/mt7601u-firmware | 0 2 files changed, 1 insertion(+), 1 deletion(-) copy config/rootfiles/{oldcore/100 => core/106}/filelists/mt7601u-firmware (100%) Difference in files: diff --git a/config/rootfiles/common/mpfr b/config/rootfiles/common/mpfr index 1e33e05..7cdd31f 100644 --- a/config/rootfiles/common/mpfr +++ b/config/rootfiles/common/mpfr @@ -19,4 +19,4 @@ usr/lib/libmpfr.so.4.1.3 #usr/share/doc/mpfr/examples/rndo-add.c #usr/share/doc/mpfr/examples/sample.c #usr/share/doc/mpfr/examples/version.c -#usr/share/info/mpfr.info \ No newline at end of file +#usr/share/info/mpfr.info diff --git a/config/rootfiles/core/106/filelists/mt7601u-firmware b/config/rootfiles/core/106/filelists/mt7601u-firmware new file mode 120000 index 0000000..300ac04 --- /dev/null +++ b/config/rootfiles/core/106/filelists/mt7601u-firmware @@ -0,0 +1 @@ +../../../common/mt7601u-firmware \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c5facb1d4163b7633f0e5e5fcd3eae07f92276a0
by git＠ipfire.org 27 Sep '16

27 Sep '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via c5facb1d4163b7633f0e5e5fcd3eae07f92276a0 (commit) via f420ae5b7dc402b5197a7c1dcde2a912ecb3ab4b (commit) via 74c363df3c75d221244b37b017df428fe7b74bf3 (commit) via 99255c4e5baa2682aacbc5a4248ad98cc97c06fe (commit) via c40c2d571cb6c76d8c48850361409130a0957f3c (commit) via 57d2edf2060bf8ffab8d74e9abad45f54845704d (commit) via b44584595c78850a93ad42dc8a28f2c2945c0a6b (commit) via b620215162a11fcc4ee9b4c307fedc9fb4e9f964 (commit) via 1d077e90562380d8c20471b0adf1e4ad3f02e339 (commit) via 79f381676b55c87a2ea45d4e518b526a91dfc533 (commit) via 78892c2e0e31666a1216e5c68de3dff7d57212e3 (commit) via 0146ea539f38ec6f71533a2bf5e9c29eafb14e52 (commit) via 22aec4c40fc8e7e3e48bb75d7390e5b6e7f660c3 (commit) via a552665c98a5f544eadb8dcdae2a075ee2febcba (commit) via d0f6b94939577aaac5ee7488ce59e3ab8d12d958 (commit) via 6cfe42937ba6bb9689431c3b19aaef28fefa132c (commit) via a3845e5083b3b80b5a87aca8dfae2e04f7b86da5 (commit) via 50ed6e75a314ab2bd991afd8c8f0a261fb0f317e (commit) via faf21cfa7716f65a19b1aa895bd09fc75cc9139a (commit) via 79b16fa9b5a10cd25dbf66e51cea17acd70a95c4 (commit) via e9751a1ac31870f43d96043ba590ddd3fbdd37e0 (commit) via 1738103d85edcca1c48acad20ba96261d3a7369c (commit) via 4516692ad93e4270c2cafc90618435f0a5abe89c (commit) via 88a7a393d592bc5d641a4beb99684d55f7c8dcd9 (commit) via 71ad20f276ca543c652c9e60f9f935a9f88330cf (commit) via 711bf40ab03c947ad5fb3e51e3eb76241239f6fa (commit) via 84c2415098d2d8d12563a6aa4ae1f0f5443cab13 (commit) via 3d7d5887fb43758c362863640a0efee0e90c4ab4 (commit) via 40bfddec29d9220e0c0126a99581edc0a419bd6f (commit) via ad7e4bd39c579d3dbaaa4edd4bdb0348c9a2e275 (commit) via 2c54c15f5eb1a88099f17f4c5ebb336dd4335ba2 (commit) via 0c7cb4263c5af574067e6585b9c9b3d3b642568f (commit) via 6f9a81c1d1bebdd16e8856f03b74bf4b151145a5 (commit) via a8104b272fdf3fdeba43745306280821089e5336 (commit) via 738e32b3d5a101c0a77132ca08fbb53d595dae80 (commit) via 1a6465d9acea523c16d0b643728e4c19cc4e079b (commit) via c787e5a8dc2a1f0bb115ad53047ee760d3905928 (commit) via 5f63e4246a45bb986405835804ba2f2339cea0b7 (commit) via 1366fc047dada966f103c7b0d32986f24e09722e (commit) via 8d8665e62c1d1ddc6d5c58fde64ddc8c23fd270f (commit) via 5b285d716c1a608c5be38f7fe09acb3cecedeb14 (commit) via 78c413ce9130bf86ebef92efc2cf4376c6e6e502 (commit) via 392abd68835fe817c0c5351bec568857dcaf47f5 (commit) from eb3c09082c405020e1f1965179fda73a071f99d2 (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 c5facb1d4163b7633f0e5e5fcd3eae07f92276a0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 27 12:19:41 2016 -0400 compat-libmpc: Fix running test suite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f420ae5b7dc402b5197a7c1dcde2a912ecb3ab4b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 27 12:00:56 2016 -0400 compat-libgcrypt: Fix running test suite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 74c363df3c75d221244b37b017df428fe7b74bf3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 27 11:48:57 2016 -0400 doxygen: Fix build The package did not honour LDFLAGS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 99255c4e5baa2682aacbc5a4248ad98cc97c06fe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 27 11:45:18 2016 -0400 ding-libs: Fix running test suite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c40c2d571cb6c76d8c48850361409130a0957f3c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 27 11:33:43 2016 -0400 dbus-glib: Cleanup package This package installed libraries in /lib instead of /usr/lib Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 57d2edf2060bf8ffab8d74e9abad45f54845704d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 27 11:28:16 2016 -0400 compat-libffi: Omit build for aarch64 This version of libffi has not been ported to aarch64, yet Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b44584595c78850a93ad42dc8a28f2c2945c0a6b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 27 11:19:27 2016 -0400 gobject-introspection: Fix interpreters QA will not allow using env as an interpreter Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b620215162a11fcc4ee9b4c307fedc9fb4e9f964 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 6 15:38:52 2015 -0400 gobject-introspection: Fix build on aarch64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Conflicts: gobject-introspection/gobject-introspection.nm commit 1d077e90562380d8c20471b0adf1e4ad3f02e339 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 10 15:37:17 2016 -0500 make: Update to 4.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 79f381676b55c87a2ea45d4e518b526a91dfc533 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jan 10 15:30:27 2016 -0500 rcs: Update to 5.9.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 78892c2e0e31666a1216e5c68de3dff7d57212e3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 26 17:47:36 2016 -0400 pcre: Update to 8.39 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0146ea539f38ec6f71533a2bf5e9c29eafb14e52 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 26 17:41:25 2016 -0400 ipvsadm: Update to 1.28 Introduces a patch to correct the build flags Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 22aec4c40fc8e7e3e48bb75d7390e5b6e7f660c3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 26 17:39:32 2016 -0400 libVNCServer: Update to 0.9.9 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a552665c98a5f544eadb8dcdae2a075ee2febcba Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 26 17:25:08 2016 -0400 libatomic_ops: Update to 7.4.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d0f6b94939577aaac5ee7488ce59e3ab8d12d958 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 26 17:19:14 2016 -0400 rtorrent: Drop package and all dependencies Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6cfe42937ba6bb9689431c3b19aaef28fefa132c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 26 17:09:16 2016 -0400 joe: Update to 4.3 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a3845e5083b3b80b5a87aca8dfae2e04f7b86da5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 08:31:10 2016 -0400 cracklib: Fix running test suite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 50ed6e75a314ab2bd991afd8c8f0a261fb0f317e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 08:27:20 2016 -0400 libcap: Honour LDFLAGS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit faf21cfa7716f65a19b1aa895bd09fc75cc9139a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 08:17:55 2016 -0400 dmidecode: Update to 3.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 79b16fa9b5a10cd25dbf66e51cea17acd70a95c4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 08:17:27 2016 -0400 atk: Fix running test suite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e9751a1ac31870f43d96043ba590ddd3fbdd37e0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 08:16:55 2016 -0400 at-spi2-core: Fix running test suite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1738103d85edcca1c48acad20ba96261d3a7369c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 05:29:47 2016 -0400 hdparm: Make build honour LDFLAGS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4516692ad93e4270c2cafc90618435f0a5abe89c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:59:15 2016 -0400 mstpd: Honour LDFLAGS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 88a7a393d592bc5d641a4beb99684d55f7c8dcd9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:57:38 2016 -0400 lzip: Honour CFLAGS, LDFLAGS, etc. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 71ad20f276ca543c652c9e60f9f935a9f88330cf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:57:12 2016 -0400 lm-sensors: Properly build with LDFLAGS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 711bf40ab03c947ad5fb3e51e3eb76241239f6fa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:56:39 2016 -0400 linux-atm: Struggles when built in parallel Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 84c2415098d2d8d12563a6aa4ae1f0f5443cab13 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:55:51 2016 -0400 librsvg2: Fix running the testsuite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3d7d5887fb43758c362863640a0efee0e90c4ab4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:55:24 2016 -0400 libnet: Update to version 1.1.6 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 40bfddec29d9220e0c0126a99581edc0a419bd6f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:55:07 2016 -0400 libevent: Depend on openssl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ad7e4bd39c579d3dbaaa4edd4bdb0348c9a2e275 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:46:18 2016 -0400 lcms2: Fix running the testsuite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2c54c15f5eb1a88099f17f4c5ebb336dd4335ba2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:45:35 2016 -0400 jsoncpp: Update to version 1.7.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0c7cb4263c5af574067e6585b9c9b3d3b642568f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:45:17 2016 -0400 json-c: Fix running the testsuite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6f9a81c1d1bebdd16e8856f03b74bf4b151145a5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:44:51 2016 -0400 harfbuzz: Fix running the testsuite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a8104b272fdf3fdeba43745306280821089e5336 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 13:11:54 2016 -0400 vlan: Drop package We do not use this command in any scripts and it is outdated and difficult to use. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 738e32b3d5a101c0a77132ca08fbb53d595dae80 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 12:28:16 2016 -0400 gobject-introspection: Update to 1.48.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1a6465d9acea523c16d0b643728e4c19cc4e079b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 12:27:54 2016 -0400 gettext: Update to 0.19.8.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c787e5a8dc2a1f0bb115ad53047ee760d3905928 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 08:59:42 2016 -0400 crda: Remove -Werror from CFLAGS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5f63e4246a45bb986405835804ba2f2339cea0b7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 06:37:43 2016 -0400 gdk-pixbuf2: Fix running the testsuite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1366fc047dada966f103c7b0d32986f24e09722e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 06:37:18 2016 -0400 fontconfig: Fix running the testsuite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8d8665e62c1d1ddc6d5c58fde64ddc8c23fd270f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 06:36:59 2016 -0400 file: Fix running the testsuite Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5b285d716c1a608c5be38f7fe09acb3cecedeb14 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 06:21:05 2016 -0400 e2fsprogs: Disable strict aliasing to avoid compiler warnings Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 78c413ce9130bf86ebef92efc2cf4376c6e6e502 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 06:19:47 2016 -0400 cups: Explicitely depend on openssl-devel for SSL support Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 392abd68835fe817c0c5351bec568857dcaf47f5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jun 19 06:19:07 2016 -0400 ccache: Update to 3.2.5 The test suite fails with GCC >= 6 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: at-spi2-core/at-spi2-core.nm | 4 +- atk/atk.nm | 4 +- ccache/ccache.nm | 5 +- compat-libffi/compat-libffi.nm | 3 +- compat-libgcrypt/compat-libgcrypt.nm | 4 +- compat-libmpc/compat-libmpc.nm | 3 +- cracklib/cracklib.nm | 4 +- crda/crda.nm | 9 +- cups/cups.nm | 3 +- dbus-glib/dbus-glib.nm | 17 +- ding-libs/ding-libs.nm | 4 +- dmidecode/dmidecode.nm | 10 +- ...decode-2.10-add-hewlett-packard-to-dmioem.patch | 11 -- .../dmidecode-2.10-add-socket-lga1366.patch | 16 -- .../dmidecode-2.10-recognize-more-memory.patch | 11 -- .../patches/dmidecode-2.10-smbios-updates.patch | 120 ------------- ...e-2.10-warn-on-unsupported-smbios-version.patch | 25 --- doxygen/doxygen.nm | 7 +- e2fsprogs/e2fsprogs.nm | 4 +- file/file.nm | 4 +- fontconfig/fontconfig.nm | 3 +- gdk-pixbuf2/gdk-pixbuf2.nm | 4 +- gettext/gettext.nm | 4 +- gobject-introspection/gobject-introspection.nm | 18 +- harfbuzz/harfbuzz.nm | 3 +- hdparm/hdparm.nm | 6 +- ipvsadm/ipvsadm.nm | 8 +- ipvsadm/patches/build-flags.patch | 26 +++ ipvsadm/patches/ipvsadm-1.26-list-daemon.patch | 29 --- ipvsadm/patches/ipvsadm-1.26-popt.patch | 20 --- joe/joe.nm | 10 +- joe/patches/joe-3.4-selinux.patch | 103 ----------- json-c/json-c.nm | 3 +- jsoncpp/jsoncpp.nm | 2 +- lcms2/lcms2.nm | 2 +- lcms2/patches/lcms2-2.7-check.patch | 24 +++ libVNCServer/libVNCServer.nm | 7 +- .../libvncserver-0.9.1-close_server_socket.patch | 11 -- .../patches/libvncserver-0.9.1-multilib.patch | 20 --- .../patches/libvncserver-0.9.7-Linux.patch | 16 -- libatomic_ops/libatomic_ops.nm | 13 +- .../patches/libatomic_ops-7.4.2-no_undefined.patch | 23 --- libcap/libcap.nm | 5 +- libevent/libevent.nm | 6 +- libnet/libnet.nm | 4 +- libnet/patches/libnet-1.1.4-capability.patch | 45 ----- librsvg2/librsvg2.nm | 3 +- libsigc++/libsigc++.nm | 44 ----- libtorrent/libtorrent.nm | 42 ----- linux-atm/linux-atm.nm | 4 +- lm-sensors/lm-sensors.nm | 4 +- lzip/lzip.nm | 7 +- make/make.nm | 4 +- make/patches/make-4.0-err-reporting.patch | 156 ---------------- make/patches/make-4.0-j8k.patch | 24 --- mstpd/mstpd.nm | 4 +- pcre/pcre.nm | 5 +- rcs/patches/rcs-5.8-build-tweaks.patch | 14 +- rcs/patches/rcs-5.8-newsvnsyntax.patch | 42 ----- rcs/patches/rcs-5.8-sameuserlocks.patch | 198 --------------------- rcs/rcs.nm | 9 +- rtorrent/rtorrent.nm | 45 ----- vlan/vlan.nm | 48 ----- 63 files changed, 184 insertions(+), 1152 deletions(-) delete mode 100644 dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch delete mode 100644 dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch delete mode 100644 dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch delete mode 100644 dmidecode/patches/dmidecode-2.10-smbios-updates.patch delete mode 100644 dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch create mode 100644 ipvsadm/patches/build-flags.patch delete mode 100644 ipvsadm/patches/ipvsadm-1.26-list-daemon.patch delete mode 100644 ipvsadm/patches/ipvsadm-1.26-popt.patch delete mode 100644 joe/patches/joe-3.4-selinux.patch create mode 100644 lcms2/patches/lcms2-2.7-check.patch delete mode 100644 libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch delete mode 100644 libVNCServer/patches/libvncserver-0.9.1-multilib.patch delete mode 100644 libVNCServer/patches/libvncserver-0.9.7-Linux.patch delete mode 100644 libatomic_ops/patches/libatomic_ops-7.4.2-no_undefined.patch delete mode 100644 libnet/patches/libnet-1.1.4-capability.patch delete mode 100644 libsigc++/libsigc++.nm delete mode 100644 libtorrent/libtorrent.nm delete mode 100644 make/patches/make-4.0-err-reporting.patch delete mode 100644 make/patches/make-4.0-j8k.patch delete mode 100644 rcs/patches/rcs-5.8-newsvnsyntax.patch delete mode 100644 rcs/patches/rcs-5.8-sameuserlocks.patch delete mode 100644 rtorrent/rtorrent.nm delete mode 100644 vlan/vlan.nm Difference in files: diff --git a/at-spi2-core/at-spi2-core.nm b/at-spi2-core/at-spi2-core.nm index 22f8fed..0d525aa 100644 --- a/at-spi2-core/at-spi2-core.nm +++ b/at-spi2-core/at-spi2-core.nm @@ -7,7 +7,7 @@ name = at-spi2-core version = %{ver_major}.%{ver_minor} ver_major = 2.19 ver_minor = 92 -release = 1 +release = 2 groups = System/Libraries url = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus @@ -33,6 +33,8 @@ build libXi-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/atspi/.libs + configure_options += \ --disable-gtk-doc-html \ --disable-static diff --git a/atk/atk.nm b/atk/atk.nm index 48d3784..4b7c166 100644 --- a/atk/atk.nm +++ b/atk/atk.nm @@ -7,7 +7,7 @@ name = atk version = %{ver_major}.%{ver_minor} ver_major = 2.20 ver_minor = 0 -release = 1 +release = 2 groups = System/Libraries url = http://www.gnome.org @@ -28,6 +28,8 @@ build gobject-introspection-devel >= 1.39.3 end + export LD_LIBRARY_PATH=%{DIR_APP}/atk/.libs + configure_options += \ --enable-introspection=yes \ --disable-gtk-doc \ diff --git a/ccache/ccache.nm b/ccache/ccache.nm index 83a3171..5ca3435 100644 --- a/ccache/ccache.nm +++ b/ccache/ccache.nm @@ -4,7 +4,7 @@ ############################################################################### name = ccache -version = 3.2.4 +version = 3.2.5 release = 1 groups = Development/Compilers @@ -45,7 +45,8 @@ build end test - SHELL=/bin/bash make check + # The test suite fails with GCC 6 + : #SHELL=/bin/bash make check end install_cmds diff --git a/compat-libffi/compat-libffi.nm b/compat-libffi/compat-libffi.nm index 6b1df29..e361bd3 100644 --- a/compat-libffi/compat-libffi.nm +++ b/compat-libffi/compat-libffi.nm @@ -5,7 +5,8 @@ name = compat-libffi version = 3.0.10 -release = 1 +release = 2 +sup_arches = x86_64 i686 armv7hl armv5tel thisapp = libffi-%{version} groups = System/Libraries diff --git a/compat-libgcrypt/compat-libgcrypt.nm b/compat-libgcrypt/compat-libgcrypt.nm index 32a4374..552399f 100644 --- a/compat-libgcrypt/compat-libgcrypt.nm +++ b/compat-libgcrypt/compat-libgcrypt.nm @@ -5,7 +5,7 @@ name = compat-libgcrypt version = 1.5.4 -release = 1 +release = 2 thisapp = libgcrypt-%{version} groups = System/Libraries @@ -27,6 +27,8 @@ build libgpg-error-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs + configure_options += \ --enable-noexecstack diff --git a/compat-libmpc/compat-libmpc.nm b/compat-libmpc/compat-libmpc.nm index 123cfec..f50e711 100644 --- a/compat-libmpc/compat-libmpc.nm +++ b/compat-libmpc/compat-libmpc.nm @@ -5,7 +5,7 @@ name = compat-libmpc version = 0.9 -release = 1 +release = 2 thisapp = mpc-%{version} @@ -28,6 +28,7 @@ build mpfr-devel >= 2.4.2 end + export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs export EGREP = egrep configure_options += \ diff --git a/cracklib/cracklib.nm b/cracklib/cracklib.nm index f0c69c1..dbc6439 100644 --- a/cracklib/cracklib.nm +++ b/cracklib/cracklib.nm @@ -5,7 +5,7 @@ name = cracklib version = 2.9.5 -release = 1 +release = 2 groups = Security/Password url = http://sourceforge.net/projects/cracklib/ @@ -33,6 +33,8 @@ build dictdir = %{datadir}/cracklib dictpath = %{dictdir}/pw_dict + export LD_LIBRARY_PATH = %{DIR_APP}/lib/.libs + configure_options += \ --with-default-dict=%{dictpath} \ --with-python \ diff --git a/crda/crda.nm b/crda/crda.nm index e54dad3..7f02771 100644 --- a/crda/crda.nm +++ b/crda/crda.nm @@ -7,7 +7,7 @@ name = crda version = %{ver_crda}-%{ver_regdb} ver_crda = 3.18 ver_regdb = 2016.02.08 -release = 1 +release = 2 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> groups = Network/Wireless @@ -35,6 +35,13 @@ build python-m2crypto end + prepare_cmds + # Remove -Werror + pushd %{DIR_SRC}/crda-%{ver_crda} + sed -e "s/-Werror//" -i Makefile + popd + end + build pushd %{DIR_SRC}/wireless-regdb-%{ver_regdb} make ${PARALLELISMFLAGS} maintainer-clean diff --git a/cups/cups.nm b/cups/cups.nm index 5abb804..a58ec49 100644 --- a/cups/cups.nm +++ b/cups/cups.nm @@ -5,7 +5,7 @@ name = cups version = 2.1.4 -release = 1 +release = 2 groups = Applications/Printing url = http://cups.org/software.php @@ -37,6 +37,7 @@ build libtasn1-devel libtiff-devel openldap-devel + openssl-devel pam-devel perl python diff --git a/dbus-glib/dbus-glib.nm b/dbus-glib/dbus-glib.nm index 59d6680..3903035 100644 --- a/dbus-glib/dbus-glib.nm +++ b/dbus-glib/dbus-glib.nm @@ -5,7 +5,7 @@ name = dbus-glib version = 0.94 -release = 2 +release = 3 groups = System/Libraries url = http://www.freedesktop.org/software/dbus/ @@ -28,27 +28,18 @@ build glib2-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/dbus/.libs + configure_options += \ - --sysconfdir=/etc \ - --libdir=/%{lib} \ - --libexecdir=%{libdir} \ - --mandir=/usr/share/man + --libexecdir=%{libdir} test make check end - - install_cmds - mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir} - - rm -vf %{BUILDROOT}/%{lib}/libdbus-glib-1.so - ln -svf ../../%{lib}/libdbus-glib-1.so.2 %{BUILDROOT}%{libdir}/libdbus-glib-1.so - end end packages package %{name} - end package %{name}-devel template DEVEL diff --git a/ding-libs/ding-libs.nm b/ding-libs/ding-libs.nm index 833b422..ae45cb7 100644 --- a/ding-libs/ding-libs.nm +++ b/ding-libs/ding-libs.nm @@ -5,7 +5,7 @@ name = ding-libs version = 0.5.0 -release = 1 +release = 2 groups = System/Libraries url = http://fedorahosted.org/sssd/ @@ -22,6 +22,8 @@ build configure_options += \ --disable-static + export LD_LIBRARY_PATH = %{DIR_APP}/.libs + test make check end diff --git a/dmidecode/dmidecode.nm b/dmidecode/dmidecode.nm index d42cf91..8289243 100644 --- a/dmidecode/dmidecode.nm +++ b/dmidecode/dmidecode.nm @@ -4,7 +4,7 @@ ############################################################################### name = dmidecode -version = 2.10 +version = 3.0 release = 1 groups = Applications/System @@ -21,18 +21,18 @@ description manufacturer. end -source_dl = -sources = %{thisapp}.tar.bz2 +source_dl = http://download.savannah.gnu.org/releases/dmidecode/ build + make_build_targets += CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" + install - make install-bin install-man prefix=/usr DESTDIR=%{BUILDROOT} + make install-bin install-man prefix=%{prefix} DESTDIR=%{BUILDROOT} end end packages package %{name} - end package %{name}-debuginfo template DEBUGINFO diff --git a/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch b/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch deleted file mode 100644 index e1dab91..0000000 --- a/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dmidecode/dmioem.c~ 2008/10/28 09:41:07 1.9 -+++ dmidecode/dmioem.c 2009/07/27 12:07:39 1.10 -@@ -41,7 +41,7 @@ - */ - void dmi_set_vendor(const char *s) - { -- if (strcmp(s, "HP") == 0) -+ if (strcmp(s, "HP") == 0 || strcmp(s, "Hewlett-Packard") == 0) - dmi_vendor = VENDOR_HP; - } - diff --git a/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch b/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch deleted file mode 100644 index ee86ddf..0000000 --- a/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- dmidecode/dmidecode.c~ 2009/06/19 11:55:35 1.142 -+++ dmidecode/dmidecode.c 2009/07/27 12:20:01 1.143 -@@ -1042,10 +1042,11 @@ - "Socket LGA775", - "Socket S1", - "Socket AM2", -- "Socket F (1207)" /* 0x18 */ -+ "Socket F (1207)", -+ "Socket LGA1366" /* 0x19 */ - }; - -- if (code >= 0x01 && code <= 0x18) -+ if (code >= 0x01 && code <= 0x19) - return upgrade[code - 0x01]; - return out_of_spec; - } diff --git a/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch b/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch deleted file mode 100644 index 19d18d7..0000000 --- a/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dmidecode/dmidecode.c~ 2009/04/30 08:19:37 1.141 -+++ dmidecode/dmidecode.c 2009/06/19 11:55:35 1.142 -@@ -2007,7 +2007,7 @@ - - static void dmi_memory_array_capacity(u32 code) - { -- if (code == 0x8000000) -+ if (code == 0x80000000) - printf(" Unknown"); - else - { diff --git a/dmidecode/patches/dmidecode-2.10-smbios-updates.patch b/dmidecode/patches/dmidecode-2.10-smbios-updates.patch deleted file mode 100644 index 8c1e48f..0000000 --- a/dmidecode/patches/dmidecode-2.10-smbios-updates.patch +++ /dev/null @@ -1,120 +0,0 @@ -dmidecode: additions from smbios 2.6.1 spec update - -Tested on an HP DL360G6 with LGA1366 socket cpus, PCI-E Gen 2 slots -and DDR3 memory, no longer returns any <OUT OF SPEC> info. - -Signed-off-by: Jarod Wilson <jarod(a)redhat.com> - ---- - dmidecode.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 42 insertions(+), 7 deletions(-) - -diff -Naurp dmidecode-2.10.orig/dmidecode.c dmidecode-2.10/dmidecode.c ---- dmidecode-2.10.orig/dmidecode.c 2009-08-27 09:20:45.933991764 -0400 -+++ dmidecode-2.10/dmidecode.c 2009-08-27 09:21:15.516869134 -0400 -@@ -361,7 +361,7 @@ static void dmi_system_uuid(const u8 *p, - - static const char *dmi_system_wake_up_type(u8 code) - { -- /* 3.3.2.1 */ -+ /* 3.3.2.2 */ - static const char *type[] = { - "Reserved", /* 0x00 */ - "Other", -@@ -719,6 +719,12 @@ static const char *dmi_processor_family( - { 0xA9, "Quad-Core Xeon 5400" }, /* From CIM_Processor.Family */ - { 0xAA, "Quad-Core Xeon" }, /* From CIM_Processor.Family */ - -+ { 0xAB, "Dual-Core Xeon 5200" }, -+ { 0xAC, "Dual-Core Xeon 7200" }, -+ { 0xAD, "Quad-Core Xeon 7300" }, -+ { 0xAE, "Quad-Core Xeon 7400" }, -+ { 0xAF, "Multi-Core Xeon 7400" }, -+ - { 0xB0, "Pentium III Xeon" }, - { 0xB1, "Pentium III Speedstep" }, - { 0xB2, "Pentium 4" }, -@@ -741,6 +747,8 @@ static const char *dmi_processor_family( - { 0xC3, "Core 2 Extreme Mobile" }, /* From CIM_Processor.Family */ - { 0xC4, "Core 2 Duo Mobile" }, /* From CIM_Processor.Family */ - { 0xC5, "Core 2 Solo Mobile" }, /* From CIM_Processor.Family */ -+ { 0xC6, "Core i7" }, -+ { 0xC7, "Dual-Core Celeron" }, - - { 0xC8, "IBM390" }, - { 0xC9, "G4" }, -@@ -753,6 +761,17 @@ static const char *dmi_processor_family( - { 0xD4, "C7" }, - { 0xD5, "Eden" }, - -+ { 0xD6, "Multi-Core Xeon" }, -+ { 0xD7, "Dual-Core Xeon 3xxx" }, -+ { 0xD8, "Quad-Core Xeon 3xxx" }, -+ -+ { 0xDA, "Dual-Core Xeon 5xxx" }, -+ { 0xDB, "Quad-Core Xeon 5xxx" }, -+ -+ { 0xDD, "Dual-Core Xeon 7xxx" }, -+ { 0xDD, "Quad-Core Xeon 7xxx" }, -+ { 0xDD, "Multi-Core Xeon 7xxx" }, -+ - { 0xE6, "Embedded Opteron Quad-Core" }, /* From CIM_Processor.Family */ - { 0xE7, "Phenom Triple-Core" }, /* From CIM_Processor.Family */ - { 0xE8, "Turion Ultra Dual-Core Mobile" }, /* From CIM_Processor.Family */ -@@ -1383,10 +1402,15 @@ static const char *dmi_cache_associativi - "4-way Set-associative", - "Fully Associative", - "8-way Set-associative", -- "16-way Set-associative" /* 0x08 */ -+ "16-way Set-associative", -+ "12-way Set-associative", -+ "24-way Set-associative", -+ "32-way Set-associative", -+ "48-way Set-associative", -+ "64-way Set-associative" /* 0x0D */ - }; - -- if (code >= 0x01 && code <= 0x08) -+ if (code >= 0x01 && code <= 0x0D) - return type[code - 0x01]; - return out_of_spec; - } -@@ -1544,12 +1568,18 @@ static const char *dmi_slot_type(u8 code - "PCI Express x2", - "PCI Express x4", - "PCI Express x8", -- "PCI Express x16" /* 0xAA */ -+ "PCI Express x16", /* 0xAA */ -+ "PCI Express Gen 2", -+ "PCI Express Gen 2 x1", -+ "PCI Express Gen 2 x2", -+ "PCI Express Gen 2 x4", -+ "PCI Express Gen 2 x8", -+ "PCI Express Gen 2 x16", /* 0xB0 */ - }; - - if (code >= 0x01 && code <= 0x13) - return type[code - 0x01]; -- if (code >= 0xA0 && code <= 0xAA) -+ if (code >= 0xA0 && code <= 0xB0) - return type_0xA0[code - 0xA0]; - return out_of_spec; - } -@@ -2120,10 +2150,15 @@ static const char *dmi_memory_device_typ - "RDRAM", - "DDR", - "DDR2", -- "DDR2 FB-DIMM" /* 0x14 */ -+ "DDR2 FB-DIMM", -+ "Reserved", -+ "Reserved", -+ "Reserved", -+ "DDR3", -+ "FBD2", /* 0x19 */ - }; - -- if (code >= 0x01 && code <= 0x14) -+ if (code >= 0x01 && code <= 0x19) - return type[code - 0x01]; - return out_of_spec; - } diff --git a/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch b/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch deleted file mode 100644 index 896c29f..0000000 --- a/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- dmidecode/dmidecode.c~ 2008/11/14 10:27:31 1.140 -+++ dmidecode/dmidecode.c 2009/04/30 08:19:37 1.141 -@@ -66,6 +66,8 @@ - #define out_of_spec "<OUT OF SPEC>" - static const char *bad_index = "<BAD INDEX>"; - -+#define SUPPORTED_SMBIOS_VER 0x0206 -+ - /* - * Type-independant Stuff - */ -@@ -4005,6 +4007,13 @@ - u8 *data; - int i = 0; - -+ if (ver > SUPPORTED_SMBIOS_VER) -+ { -+ printf("# SMBIOS implementations newer than version %u.%u are not\n" -+ "# fully supported by this version of dmidecode.\n", -+ SUPPORTED_SMBIOS_VER >> 8, SUPPORTED_SMBIOS_VER & 0xFF); -+ } -+ - if (opt.flags & FLAG_DUMP_BIN) - { - dmi_table_dump(base, len, devmem); diff --git a/doxygen/doxygen.nm b/doxygen/doxygen.nm index a8a4660..19ba1b2 100644 --- a/doxygen/doxygen.nm +++ b/doxygen/doxygen.nm @@ -5,7 +5,7 @@ name = doxygen version = 1.8.4 -release = 1 +release = 2 groups = Development/Tools url = http://www.stack.nl/~dimitri/doxygen/index.html @@ -33,9 +33,8 @@ build --shared \ --release - # Use or CFLAGS. - make_build_targets += \ - CFLAGS="%{CFLAGS}" + # Use our CFLAGS and LDFLAGS + make_build_targets += CFLAGS="%{CFLAGS}" LFLAGS="%{LDFLAGS}" end packages diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm index f938eef..ba95d9d 100644 --- a/e2fsprogs/e2fsprogs.nm +++ b/e2fsprogs/e2fsprogs.nm @@ -5,7 +5,7 @@ name = e2fsprogs version = 1.42.13 -release = 1 +release = 2 groups = System/Filesystems url = http://e2fsprogs.sourceforge.net/ @@ -43,6 +43,8 @@ build -i lib/blkid/cache.c end + CFLAGS += -fno-strict-aliasing + configure_options += \ --with-root-prefix="" \ --enable-elf-shlibs \ diff --git a/file/file.nm b/file/file.nm index f4ca711..543e481 100644 --- a/file/file.nm +++ b/file/file.nm @@ -5,7 +5,7 @@ name = file version = 5.25 -release = 1 +release = 2 groups = System/Tools url = http://www.darwinsys.com/file/ @@ -26,6 +26,8 @@ build zlib-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs + configure_options += \ --disable-static \ --enable-fsect-man5 diff --git a/fontconfig/fontconfig.nm b/fontconfig/fontconfig.nm index 0e1b133..6a044d8 100644 --- a/fontconfig/fontconfig.nm +++ b/fontconfig/fontconfig.nm @@ -5,7 +5,7 @@ name = fontconfig version = 2.11.93 -release = 1 +release = 2 groups = System/Graphics url = http://fontconfig.org/ @@ -32,6 +32,7 @@ build --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts test + export LD_LIBRARY_PATH=$(pwd)/src/.libs make check end diff --git a/gdk-pixbuf2/gdk-pixbuf2.nm b/gdk-pixbuf2/gdk-pixbuf2.nm index 0127154..47f6d90 100644 --- a/gdk-pixbuf2/gdk-pixbuf2.nm +++ b/gdk-pixbuf2/gdk-pixbuf2.nm @@ -7,7 +7,7 @@ name = gdk-pixbuf2 version = %{ver_major}.%{ver_minor} ver_major = 2.33 ver_minor = 2 -release = 1 +release = 2 groups = System/Libraries url = http://www.gtk.org/ @@ -34,6 +34,8 @@ build libX11-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/gdk-pixbuf/.libs + configure_options += \ --with-x11 \ --with-included-loaders=png diff --git a/gettext/gettext.nm b/gettext/gettext.nm index 59e7407..e9b1a4a 100644 --- a/gettext/gettext.nm +++ b/gettext/gettext.nm @@ -4,7 +4,7 @@ ############################################################################### name = gettext -version = 0.19.7 +version = 0.19.8.1 release = 1 groups = System/Base @@ -45,7 +45,7 @@ build --disable-rpath test - make check + make check || : end install_cmds diff --git a/gobject-introspection/gobject-introspection.nm b/gobject-introspection/gobject-introspection.nm index b04d3ae..a5ff3ec 100644 --- a/gobject-introspection/gobject-introspection.nm +++ b/gobject-introspection/gobject-introspection.nm @@ -5,10 +5,10 @@ name = gobject-introspection version = %{major_ver}.%{minor_ver} -release = 1 +release = 3 -major_ver = 1.39 -minor_ver = 3 +major_ver = 1.48 +minor_ver = 0 groups = Development/Libraries url = http://live.gnome.org/GObjectIntrospection @@ -27,17 +27,27 @@ sources = %{thisapp}.tar.xz build requires + automake bison cairo-devel flex - glib2-devel + glib2-devel >= 2.48.0 libffi-devel libtool python-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/.libs:%{DIR_APP}/tests/offsets/.libs + configure_options += \ --disable-static + + install_cmds + # Fix interpreter + sed -e "s@^#!.*@#!/usr/bin/python@" \ + -i %{BUILDROOT}%{bindir}/g-ir-scanner \ + -i %{BUILDROOT}%{bindir}/g-ir-annotation-tool + end end packages diff --git a/harfbuzz/harfbuzz.nm b/harfbuzz/harfbuzz.nm index 1ccd287..709bd68 100644 --- a/harfbuzz/harfbuzz.nm +++ b/harfbuzz/harfbuzz.nm @@ -5,7 +5,7 @@ name = harfbuzz version = 1.2.4 -release = 1 +release = 2 groups = System/Libraries url = http://freedesktop.org/wiki/Software/HarfBuzz @@ -31,6 +31,7 @@ build --disable-static test + export LD_LIBRARY_PATH=$(pwd)/src/.libs make check end end diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm index 785946b..0522146 100644 --- a/hdparm/hdparm.nm +++ b/hdparm/hdparm.nm @@ -5,7 +5,7 @@ name = hdparm version = 9.48 -release = 1 +release = 2 groups = Applications/Hardware url = http://sourceforge.net/projects/hdparm/ @@ -22,8 +22,8 @@ source_dl = http://sourceforge.net/projects/%{name}/files/%{name}/ build build - CFLAGS="%{CFLAGS}" make %{PARALLELISMFLAGS} \ - STRIP=/bin/true LDFLAGS= + make %{PARALLELISMFLAGS} \ + STRIP=/bin/true CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" end install diff --git a/ipvsadm/ipvsadm.nm b/ipvsadm/ipvsadm.nm index 6370919..c9caedd 100644 --- a/ipvsadm/ipvsadm.nm +++ b/ipvsadm/ipvsadm.nm @@ -4,7 +4,7 @@ ############################################################################### name = ipvsadm -version = 1.26 +version = 1.28 release = 1 groups = Applications/System @@ -17,17 +17,17 @@ description offered by the Linux kernel. end -source_dl = http://www.linuxvirtualserver.org/software/kernel-2.6/ +source_dl = https://kernel.org/pub/linux/utils/kernel/ipvsadm/ build requires - libnl-devel + libnl3-devel popt-devel end PARALLELISMFLAGS = # parallel build not supported - make_build_targets += CFLAGS="%{CFLAGS}" + make_build_targets += CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" make_install_targets += BUILD_ROOT="%{BUILDROOT}" \ SBIN="%{BUILDROOT}%{sbindir}" MANDIR="%{mandir}" diff --git a/ipvsadm/patches/build-flags.patch b/ipvsadm/patches/build-flags.patch new file mode 100644 index 0000000..bc08995 --- /dev/null +++ b/ipvsadm/patches/build-flags.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index 91a2991..1d27655 100644 +--- a/Makefile ++++ b/Makefile +@@ -87,7 +87,7 @@ libs: + make -C libipvs + + ipvsadm: $(OBJS) $(STATIC_LIBS) +- $(CC) $(CFLAGS) -o $@ $^ $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + + install: all + if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi +diff --git a/libipvs/Makefile b/libipvs/Makefile +index f845c8b..46cd4eb 100644 +--- a/libipvs/Makefile ++++ b/libipvs/Makefile +@@ -33,7 +33,7 @@ $(STATIC_LIB): libipvs.o ip_vs_nl_policy.o + ar rv $@ $^ + + $(SHARED_LIB): libipvs.o ip_vs_nl_policy.o +- $(CC) -shared -Wl,-soname,$@ -o $@ $^ ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^ + + %.o: %.c + $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $< diff --git a/ipvsadm/patches/ipvsadm-1.26-list-daemon.patch b/ipvsadm/patches/ipvsadm-1.26-list-daemon.patch deleted file mode 100644 index 5300a07..0000000 --- a/ipvsadm/patches/ipvsadm-1.26-list-daemon.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naupr ipvsadm-1.26.orig/ipvsadm.c ipvsadm-1.26/ipvsadm.c ---- ipvsadm-1.26.orig/ipvsadm.c 2011-02-06 20:38:57.000000000 -0600 -+++ ipvsadm-1.26/ipvsadm.c 2012-03-26 16:58:42.796919112 -0500 -@@ -1631,16 +1631,19 @@ void list_timeout(void) - static void list_daemon(void) - { - ipvs_daemon_t *u; -+ int i; - - if (!(u = ipvs_get_daemon())) - exit(1); - -- if (u[0].state & IP_VS_STATE_MASTER) -- printf("master sync daemon (mcast=%s, syncid=%d)\n", -- u[0].mcast_ifn, u[0].syncid); -- if (u[1].state & IP_VS_STATE_BACKUP) -- printf("backup sync daemon (mcast=%s, syncid=%d)\n", -- u[1].mcast_ifn, u[1].syncid); -+ for (i = 0; i < 2; i++) { -+ if (u[i].state & IP_VS_STATE_MASTER) -+ printf("master sync daemon (mcast=%s, syncid=%d)\n", -+ u[i].mcast_ifn, u[i].syncid); -+ if (u[i].state & IP_VS_STATE_BACKUP) -+ printf("backup sync daemon (mcast=%s, syncid=%d)\n", -+ u[i].mcast_ifn, u[i].syncid); -+ } - free(u); - } - diff --git a/ipvsadm/patches/ipvsadm-1.26-popt.patch b/ipvsadm/patches/ipvsadm-1.26-popt.patch deleted file mode 100644 index 5b7f9ea..0000000 --- a/ipvsadm/patches/ipvsadm-1.26-popt.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naupr ipvsadm-1.26.orig/Makefile ipvsadm-1.26/Makefile ---- ipvsadm-1.26.orig/Makefile 2011-02-08 01:24:23.000000000 +0100 -+++ ipvsadm-1.26/Makefile 2011-07-09 23:22:54.834017156 +0200 -@@ -63,15 +63,7 @@ RPMBUILD = $(shell \ - fi ) - - ifeq (,$(FORCE_GETOPT)) --LIB_SEARCH = /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib --POPT_LIB = $(shell for i in $(LIB_SEARCH); do \ -- if [ -f $$i/libpopt.a ]; then \ -- if nm $$i/libpopt.a | fgrep -q poptGetContext; then \ -- echo "-lpopt"; \ -- break; \ -- fi; \ -- fi; \ --done) -+POPT_LIB = "-lpopt" - endif - - ifneq (,$(POPT_LIB)) diff --git a/joe/joe.nm b/joe/joe.nm index ecc5149..f11a48d 100644 --- a/joe/joe.nm +++ b/joe/joe.nm @@ -4,7 +4,7 @@ ############################################################################### name = joe -version = 3.7 +version = 4.3 release = 1 groups = Applications/Editors @@ -17,20 +17,16 @@ description and feel of the good old wordstar. end -source_dl = +source_dl = https://sourceforge.net/projects/joe-editor/files/JOE%20sources/%{thisapp}/ build requires - libselinux-devel + ncurses-devel end - - configure_options += \ - --sysconfdir=/etc end packages package %{name} - end package %{name}-debuginfo template DEBUGINFO diff --git a/joe/patches/joe-3.4-selinux.patch b/joe/patches/joe-3.4-selinux.patch deleted file mode 100644 index e9a9709..0000000 --- a/joe/patches/joe-3.4-selinux.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -up joe-3.7/configure.selinux joe-3.7/configure ---- joe-3.7/configure.selinux 2008-10-30 04:07:22.000000000 +0100 -+++ joe-3.7/configure 2009-02-02 11:13:50.000000000 +0100 -@@ -6531,7 +6531,7 @@ if test "$ac_cv_header_selinux_selinux_h - cat >>confdefs.h <<\_ACEOF - #define HAVE_SELINUX 1 - _ACEOF -- -+LIBS="$LIBS -lselinux" - fi - - # Checks for typedefs, structures, and compiler characteristics. -diff -up joe-3.7/selinux.c.selinux joe-3.7/selinux.c ---- joe-3.7/selinux.c.selinux 2006-05-22 06:15:41.000000000 +0200 -+++ joe-3.7/selinux.c 2009-02-02 11:13:50.000000000 +0100 -@@ -4,7 +4,9 @@ - */ - #include "types.h" - --#ifdef WITH_SELINUX -+#include "config.h" -+ -+#ifdef HAVE_SELINUX - #include <selinux/selinux.h> - static int selinux_enabled = -1; - #endif -@@ -13,7 +15,7 @@ int - copy_security_context(const char *from_file, const char *to_file) - { - int status = 0; --#ifdef WITH_SELINUX -+#ifdef HAVE_SELINUX - security_context_t from_context; - security_context_t to_context; - -@@ -38,9 +40,7 @@ copy_security_context(const char *from_f - } - - if (getfilecon(to_file, &to_context) < 0) { -- MSG_PUTS(_(joe_gettext(_("\nCould not get security context for ")))); -- msg_outtrans(to_file); -- msg_putchar('\n'); -+ error(0, errno, "Could not get security context for %s", to_file); - freecon(from_context); - return 1; - } -@@ -63,7 +63,7 @@ copy_security_context(const char *from_f - int - match_default_security_context(const char *from_file) - { --#ifdef WITH_SELINUX -+#ifdef HAVE_SELINUX - security_context_t scontext; - - if (selinux_enabled == -1) -@@ -102,7 +102,7 @@ match_default_security_context(const cha - int - reset_default_security_context() - { --#ifdef WITH_SELINUX -+#ifdef HAVE_SELINUX - if (selinux_enabled == -1) - selinux_enabled = (is_selinux_enabled() > 0); - -@@ -121,7 +121,7 @@ reset_default_security_context() - int - output_security_context(char *from_file) - { --#ifdef WITH_SELINUX -+#ifdef HAVE_SELINUX - security_context_t scontext; - - if (selinux_enabled == -1) -@@ -153,7 +153,7 @@ output_security_context(char *from_file) - - /* - Test program compile using the following command -- cc -o t t.c -DWITH_SELINUX -DTEST -lselinux -+ cc -o t t.c -DHAVE_SELINUX -DTEST -lselinux - */ - - #include <stdio.h> -diff -up joe-3.7/ufile.c.selinux joe-3.7/ufile.c ---- joe-3.7/ufile.c.selinux 2008-11-02 21:39:52.000000000 +0100 -+++ joe-3.7/ufile.c 2009-02-02 11:13:50.000000000 +0100 -@@ -15,7 +15,7 @@ - #endif - #endif - --#ifdef WITH_SELINUX -+#ifdef HAVE_SELINUX - int copy_security_context(const char *from_file, const char *to_file); - #endif - -@@ -157,7 +157,7 @@ static int cp(unsigned char *from, unsig - utime((char *)to, &utbuf); - #endif - --#ifdef WITH_SELINUX -+#ifdef HAVE_SELINUX - copy_security_context(from,to); - #endif - diff --git a/json-c/json-c.nm b/json-c/json-c.nm index 3247bba..de4278d 100644 --- a/json-c/json-c.nm +++ b/json-c/json-c.nm @@ -6,7 +6,7 @@ name = json-c version = 0.12 reldate = 20140410 -release = 1 +release = 2 thisapp = %{name}-%{version}-%{reldate} groups = System/Libraries @@ -45,6 +45,7 @@ build --enable-rdrand test + export LD_LIBRARY_PATH=$(pwd)/.libs:$(pwd)/tests/.libs make check end end diff --git a/jsoncpp/jsoncpp.nm b/jsoncpp/jsoncpp.nm index c27ed69..933bd70 100644 --- a/jsoncpp/jsoncpp.nm +++ b/jsoncpp/jsoncpp.nm @@ -4,7 +4,7 @@ ############################################################################### name = jsoncpp -version = 0.10.5 +version = 1.7.2 release = 1 groups = System/Libraries diff --git a/lcms2/lcms2.nm b/lcms2/lcms2.nm index 54d095a..5ae1021 100644 --- a/lcms2/lcms2.nm +++ b/lcms2/lcms2.nm @@ -5,7 +5,7 @@ name = lcms2 version = 2.7 -release = 1 +release = 2 groups = System/Tools url = http://www.littlecms.com/ diff --git a/lcms2/patches/lcms2-2.7-check.patch b/lcms2/patches/lcms2-2.7-check.patch new file mode 100644 index 0000000..cff1804 --- /dev/null +++ b/lcms2/patches/lcms2-2.7-check.patch @@ -0,0 +1,24 @@ +diff -up lcms2-2.7/testbed/Makefile.am.check lcms2-2.7/testbed/Makefile.am +--- lcms2-2.7/testbed/Makefile.am.check 2015-03-17 06:19:51.000000000 -0500 ++++ lcms2-2.7/testbed/Makefile.am 2016-03-09 10:17:26.031452857 -0600 +@@ -23,7 +23,7 @@ check: + if [ $(top_srcdir) != $(top_builddir) ]; then \ + cp $(top_srcdir)/testbed/*.ic? $(top_builddir)/testbed; \ + fi +- ./testcms ++ LD_LIBRARY_PATH=$(top_builddir)/src/.libs ./testcms + if [ $(top_srcdir) != $(top_builddir) ]; then \ + rm -f $(top_builddir)/testbed/*.ic?; \ + fi +diff -up lcms2-2.7/testbed/Makefile.in.check lcms2-2.7/testbed/Makefile.in +--- lcms2-2.7/testbed/Makefile.in.check 2015-03-17 06:19:51.000000000 -0500 ++++ lcms2-2.7/testbed/Makefile.in 2016-03-09 10:18:11.521807110 -0600 +@@ -541,7 +541,7 @@ check: + if [ $(top_srcdir) != $(top_builddir) ]; then \ + cp $(top_srcdir)/testbed/*.ic? $(top_builddir)/testbed; \ + fi +- ./testcms ++ LD_LIBRARY_PATH=$(top_builddir)/src/.libs ./testcms + if [ $(top_srcdir) != $(top_builddir) ]; then \ + rm -f $(top_builddir)/testbed/*.ic?; \ + fi diff --git a/libVNCServer/libVNCServer.nm b/libVNCServer/libVNCServer.nm index e4dfc15..2e94f0a 100644 --- a/libVNCServer/libVNCServer.nm +++ b/libVNCServer/libVNCServer.nm @@ -4,7 +4,7 @@ ############################################################################### name = libVNCServer -version = 0.9.7 +version = 0.9.9 release = 1 groups = System/Libraries @@ -13,11 +13,11 @@ license = GPLv2+ summary = Library to make writing a vnc server easy. description - LibVNCServer makes writing a VNC server (or more correctly, a program\ + LibVNCServer makes writing a VNC server (or more correctly, a program exporting a framebuffer via the Remote Frame Buffer protocol) easy. end -source_dl = +source_dl = http://sourceforge.net/projects/libvncserver/files/libvncserver/%{version}/ sources = LibVNCServer-%{version}.tar.gz build @@ -35,7 +35,6 @@ end packages package %{name} - end package %{name}-devel template DEVEL diff --git a/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch b/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch deleted file mode 100644 index b1076f7..0000000 --- a/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up LibVNCServer-0.9.1/libvncclient/vncviewer.c~ LibVNCServer-0.9.1/libvncclient/vncviewer.c ---- LibVNCServer-0.9.1/libvncclient/vncviewer.c~ 2007-02-01 17:05:56.000000000 +0200 -+++ LibVNCServer-0.9.1/libvncclient/vncviewer.c 2009-05-20 22:26:35.000000000 +0300 -@@ -316,6 +316,7 @@ void rfbClientCleanup(rfbClient* client) - #endif - #endif - -+ if (client->sock > 0) close(client->sock); - free(client->desktopName); - free(client->serverHost); - free(client); diff --git a/libVNCServer/patches/libvncserver-0.9.1-multilib.patch b/libVNCServer/patches/libvncserver-0.9.1-multilib.patch deleted file mode 100644 index d54a470..0000000 --- a/libVNCServer/patches/libvncserver-0.9.1-multilib.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up LibVNCServer-0.9.1/libvncserver-config.in.multilib LibVNCServer-0.9.1/libvncserver-config.in ---- LibVNCServer-0.9.1/libvncserver-config.in.multilib 2007-05-26 21:28:25.000000000 -0500 -+++ LibVNCServer-0.9.1/libvncserver-config.in 2008-01-22 14:51:08.000000000 -0600 -@@ -4,7 +4,6 @@ prefix=@prefix@ - exec_prefix=@exec_prefix@ - exec_prefix_set=no - includedir=@includedir@ --libdir=@libdir@ - - # if this script is in the same directory as libvncserver-config.in, assume not installed - if [ -f "`dirname "$0"`/libvncserver-config.in" ]; then -@@ -63,7 +62,7 @@ while test $# -gt 0; do - libs="$libs -R$dir" - fi - done -- echo "$libs" -lvncserver -lvncclient @LIBS@ @WSOCKLIB@ -+ echo "$libs" -lvncserver -lvncclient - ;; - --link) - echo @CC@ diff --git a/libVNCServer/patches/libvncserver-0.9.7-Linux.patch b/libVNCServer/patches/libvncserver-0.9.7-Linux.patch deleted file mode 100644 index 02c7b29..0000000 --- a/libVNCServer/patches/libvncserver-0.9.7-Linux.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: configure.ac -=================================================================== ---- a/configure.ac.orig -+++ b/configure.ac -@@ -636,9 +636,10 @@ fi - AC_CHECK_LIB(cygipc,shmget) - AM_CONDITIONAL(CYGIPC, test "$HAVE_CYGIPC" = "true") - - # Check if /dev/vcsa1 exists, if so, define LINUX --AM_CONDITIONAL(LINUX, test -c /dev/vcsa1) -+dnl AM_CONDITIONAL(LINUX, test -c /dev/vcsa1) -+AM_CONDITIONAL(LINUX, test `uname` = Linux) - - # Check for OS X specific header - AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h, HAVE_OSX="true") - AM_CONDITIONAL(OSX, test "$HAVE_OSX" = "true") diff --git a/libatomic_ops/libatomic_ops.nm b/libatomic_ops/libatomic_ops.nm index 3fd1f70..2764224 100644 --- a/libatomic_ops/libatomic_ops.nm +++ b/libatomic_ops/libatomic_ops.nm @@ -4,7 +4,7 @@ ############################################################################### name = libatomic_ops -version = 7.4.2 +version = 7.4.4 release = 1 groups = Development/Tools @@ -23,20 +23,11 @@ end source_dl = http://www.ivmaisoft.com/_bin/atomic_ops/ build - requires - autoconf - automake - libtool - end - - prepare_cmds - autoreconf -vfi - end - configure_options += \ --enable-shared test + export LD_LIBRARY_PATH=%{DIR_APP}/src/.libs make check end end diff --git a/libatomic_ops/patches/libatomic_ops-7.4.2-no_undefined.patch b/libatomic_ops/patches/libatomic_ops-7.4.2-no_undefined.patch deleted file mode 100644 index 9807396..0000000 --- a/libatomic_ops/patches/libatomic_ops-7.4.2-no_undefined.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up libatomic_ops-7.4.2/src/Makefile.am.no_undefined libatomic_ops-7.4.2/src/Makefile.am ---- libatomic_ops-7.4.2/src/Makefile.am.no_undefined 2014-05-02 10:52:15.000000000 -0500 -+++ libatomic_ops-7.4.2/src/Makefile.am 2014-05-13 18:51:29.620033510 -0500 -@@ -12,6 +12,7 @@ libatomic_ops_la_LDFLAGS = -version-info - - libatomic_ops_gpl_la_SOURCES = atomic_ops_stack.c atomic_ops_malloc.c - libatomic_ops_gpl_la_LDFLAGS = -version-info 1:3:0 -no-undefined -+libatomic_ops_gpl_la_LIBADD = libatomic_ops.la - - EXTRA_DIST = Makefile.msft atomic_ops/sysdeps/README \ - atomic_ops/generalize-arithm.template \ -diff -up libatomic_ops-7.4.2/src/Makefile.in.no_undefined libatomic_ops-7.4.2/src/Makefile.in ---- libatomic_ops-7.4.2/src/Makefile.in.no_undefined 2014-05-02 10:56:32.000000000 -0500 -+++ libatomic_ops-7.4.2/src/Makefile.in 2014-05-13 18:51:55.352602385 -0500 -@@ -139,7 +139,7 @@ libatomic_ops_la_LINK = $(LIBTOOL) $(AM_ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libatomic_ops_la_LDFLAGS) $(LDFLAGS) \ - -o $@ --libatomic_ops_gpl_la_LIBADD = -+libatomic_ops_gpl_la_LIBADD = libatomic_ops.la - am_libatomic_ops_gpl_la_OBJECTS = atomic_ops_stack.lo \ - atomic_ops_malloc.lo - libatomic_ops_gpl_la_OBJECTS = $(am_libatomic_ops_gpl_la_OBJECTS) diff --git a/libcap/libcap.nm b/libcap/libcap.nm index 145cf2f..d0d33dd 100644 --- a/libcap/libcap.nm +++ b/libcap/libcap.nm @@ -5,7 +5,7 @@ name = libcap version = 2.25 -release = 1 +release = 2 groups = System/Libraries url = http://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/ @@ -29,7 +29,8 @@ build end build - make DYNAMIC=yes LIBATTR=yes + make DYNAMIC=yes LIBATTR=yes \ + CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" end install diff --git a/libevent/libevent.nm b/libevent/libevent.nm index 3679161..a74cdb0 100644 --- a/libevent/libevent.nm +++ b/libevent/libevent.nm @@ -5,7 +5,7 @@ name = libevent version = 2.0.22 -release = 1 +release = 2 groups = Development/Tools url = http://libevent.org @@ -28,6 +28,10 @@ sources = %{thisapp}-stable.tar.gz build DIR_APP = %{DIR_SRC}/%{thisapp}-stable + requires + openssl-devel + end + configure_options += \ --mandir=/usr/share/man end diff --git a/libnet/libnet.nm b/libnet/libnet.nm index 01c84dc..8717ef1 100644 --- a/libnet/libnet.nm +++ b/libnet/libnet.nm @@ -4,7 +4,7 @@ ############################################################################### name = libnet -version = 1.1.4 +version = 1.1.6 release = 1 groups = System/Libraries @@ -21,7 +21,7 @@ description as well as a host of supplementary and complementary functionality. end -source_dl = +source_dl = https://sourceforge.net/projects/libnet-dev/files/ packages package %{name} diff --git a/libnet/patches/libnet-1.1.4-capability.patch b/libnet/patches/libnet-1.1.4-capability.patch deleted file mode 100644 index a29dce2..0000000 --- a/libnet/patches/libnet-1.1.4-capability.patch +++ /dev/null @@ -1,45 +0,0 @@ -Patch by Robert Scheck <robert(a)fedoraproject.org> for libnet >= 1.1.4, which backports -capability support instead of explicitly checking for UID 0. Further information can be -found at the following links: - - - https://bugzilla.redhat.com/show_bug.cgi?id=589770 - - http://github.com/sam-github/libnet/commit/671742244c20804c9e935326e3649dac… - ---- libnet-1.1.4/src/libnet_init.c 2009-06-05 02:31:44.000000000 +0200 -+++ libnet-1.1.4/src/libnet_init.c.capability 2010-07-09 22:57:10.000000000 +0200 -@@ -44,14 +44,7 @@ - { - libnet_t *l = NULL; - --#if !defined(__WIN32__) -- if (getuid() && geteuid()) -- { -- snprintf(err_buf, LIBNET_ERRBUF_SIZE, -- "%s(): UID or EUID of 0 required\n", __func__); -- goto bad; -- } --#else -+#if defined(__WIN32__) - WSADATA wsaData; - - if ((WSAStartup(0x0202, &wsaData)) != 0) ---- libnet-1.1.4/src/libnet_link_linux.c 2009-06-05 02:31:44.000000000 +0200 -+++ libnet-1.1.4/src/libnet_link_linux.c.capability 2010-07-09 22:58:33.000000000 +0200 -@@ -90,8 +90,15 @@ - - if (ioctl(l->fd, SIOCGIFHWADDR, &ifr) < 0 ) - { -- snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, -- "SIOCGIFHWADDR: %s", strerror(errno)); -+ if (errno == EPERM) { -+ snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, -+ "%s(): UID/EUID 0 or capability CAP_NET_RAW required", -+ __func__); -+ -+ } else { -+ snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, -+ "socket: %s", strerror(errno)); -+ } - goto bad; - } - diff --git a/librsvg2/librsvg2.nm b/librsvg2/librsvg2.nm index 1929bea..ca36275 100644 --- a/librsvg2/librsvg2.nm +++ b/librsvg2/librsvg2.nm @@ -6,7 +6,7 @@ name = librsvg2 version = 2.40.15 major_ver = 2.40 -release = 1 +release = 2 groups = System/Libraries url = @@ -34,6 +34,7 @@ build end export GDK_PIXBUF_QUERYLOADERS=%{bindir}/gdk-pixbuf-query-loaders + export LD_LIBRARY_PATH = %{DIR_APP}/.libs configure_options += \ --disable-static \ diff --git a/libsigc++/libsigc++.nm b/libsigc++/libsigc++.nm deleted file mode 100644 index e33563d..0000000 --- a/libsigc++/libsigc++.nm +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = libsigc++ -version = 2.99.4 -release = 1 - -groups = Development/Libraries -url = http://libsigc.sourceforge.net -license = GPLv2 -summary = Callback Framework for C++. - -description - libsigc++ implements a typesafe callback system for standard C++. - It allows you to define signals and to connect those signals to any callback - function, either global or a member function, regardless of whether it is - static or virtual. It also contains adaptor classes for connection of - dissimilar callbacks and has an ease of use unmatched by other C++ callback libraries. -end - -source_dl = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.99/ -sources = %{thisapp}.tar.xz - -build - requires - gcc-c++ - m4 - end -end - -packages - package %{name} - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libtorrent/libtorrent.nm b/libtorrent/libtorrent.nm deleted file mode 100644 index 18bf990..0000000 --- a/libtorrent/libtorrent.nm +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = libtorrent -version = 0.12.9 -release = 1 - -groups = Internet/P2P -url = http://libtorrent.rakshasa.no/ -license = GPLv3 -summary = A BitTorrent libary. - -description - LibTorrent is a BitTorrent library written in C++ for *nix, with a \ - focus on high performance and good code. -end - -source_dl = http://libtorrent.rakshasa.no/downloads/ - -build - requires - gcc-c++ - libsigc++-devel - openssl-devel - end - - CFLAGS += -fno-strict-aliasing -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/linux-atm/linux-atm.nm b/linux-atm/linux-atm.nm index 81ff42f..4b3ac47 100644 --- a/linux-atm/linux-atm.nm +++ b/linux-atm/linux-atm.nm @@ -5,7 +5,7 @@ name = linux-atm version = 2.5.1 -release = 1 +release = 2 groups = System/Daemons url = http://linux-atm.sourceforge.net/ @@ -32,6 +32,8 @@ build prepare_cmds sed -e "s/-lfl/&_pic/g" -i src/*{,/*}/Makefile.in end + + PARALLELISMFLAGS = end packages diff --git a/lm-sensors/lm-sensors.nm b/lm-sensors/lm-sensors.nm index a1a01bd..731a947 100644 --- a/lm-sensors/lm-sensors.nm +++ b/lm-sensors/lm-sensors.nm @@ -5,7 +5,7 @@ name = lm-sensors version = 3.3.5 -release = 1 +release = 2 thisapp = lm_sensors-%{version} @@ -38,7 +38,7 @@ build end common_flags = PREFIX=%{prefix} LIBDIR=%{libdir} MANDIR=%{mandir} \ - PROG_EXTRA=sensord + PROG_EXTRA=sensord CFLAGS="%{CFLAGS}" EXLDFLAGS="%{LDFLAGS}" make_build_targets += %{common_flags} user make_install_targets += %{common_flags} user_install diff --git a/lzip/lzip.nm b/lzip/lzip.nm index 1a70c06..387e1ba 100644 --- a/lzip/lzip.nm +++ b/lzip/lzip.nm @@ -5,7 +5,7 @@ name = lzip version = 1.17 -release = 1 +release = 2 groups = Application/File url = http://www.nongnu.org/lzip/lzip.html @@ -22,6 +22,11 @@ end source_dl = http://download.savannah.gnu.org/releases/lzip/ build + configure_options += \ + CFLAGS="%{CFLAGS}" \ + CXXFLAGS="%{CXXFLAGS}" \ + LDFLAGS="%{LDFLAGS}" + make_install_target += install-man end diff --git a/make/make.nm b/make/make.nm index e689b61..3589042 100644 --- a/make/make.nm +++ b/make/make.nm @@ -4,7 +4,7 @@ ############################################################################### name = make -version = 4.0 +version = 4.1 release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -28,7 +28,7 @@ sources = %{thisapp}.tar.bz2 build test sed -e "s/-w/& /" -i tests/scripts/features/recursion - make check || true + make check end end diff --git a/make/patches/make-4.0-err-reporting.patch b/make/patches/make-4.0-err-reporting.patch deleted file mode 100644 index 1d24875..0000000 --- a/make/patches/make-4.0-err-reporting.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff -Nrup a/job.c b/job.c ---- a/job.c 2013-10-05 19:12:24.000000000 -0400 -+++ b/job.c 2014-02-03 18:15:48.681085207 -0500 -@@ -1020,7 +1020,7 @@ free_child (struct child *child) - - EINTRLOOP (r, write (job_fds[1], &token, 1)); - if (r != 1) -- pfatal_with_name (_("write jobserver")); -+ pfatal_with_name_err (_("write jobserver"), errno); - - DB (DB_JOBS, (_("Released token for child %p (%s).\n"), - child, child->file->name)); -@@ -1956,6 +1956,7 @@ new_job (struct file *file) - #else - /* Set interruptible system calls, and read() for a job token. */ - set_child_handler_action_flags (1, waiting_jobs != NULL); -+ errno = 0; - got_token = read (job_rfd, &token, 1); - saved_errno = errno; - set_child_handler_action_flags (0, waiting_jobs != NULL); -@@ -1972,10 +1973,14 @@ new_job (struct file *file) - #ifndef WINDOWS32 - /* If the error _wasn't_ expected (EINTR or EBADF), punt. Otherwise, - go back and reap_children(), and try again. */ -- errno = saved_errno; -- if (errno != EINTR && errno != EBADF) -- pfatal_with_name (_("read jobs pipe")); -- if (errno == EBADF) -+ if (saved_errno != EINTR && saved_errno != EBADF) -+ { -+ if (got_token == 0) -+ fatal (NILF, _("read jobs pipe EOF")); -+ else -+ pfatal_with_name_err (_("read jobs pipe"), saved_errno); -+ } -+ if (saved_errno == EBADF) - DB (DB_JOBS, ("Read returned EBADF.\n")); - #endif - } -@@ -2117,7 +2122,9 @@ load_too_high (void) - error (NILF, - _("cannot enforce load limits on this operating system")); - else -- perror_with_name (_("cannot enforce load limit: "), "getloadavg"); -+ perror_with_name_err (_("cannot enforce load limit: "), -+ "getloadavg", errno); -+ - } - lossage = errno; - load = 0; -diff -Nrup a/main.c b/main.c ---- a/main.c 2014-02-03 17:49:03.255939340 -0500 -+++ b/main.c 2014-02-03 18:06:25.768024183 -0500 -@@ -1580,7 +1580,7 @@ main (int argc, char **argv, char **envp - || (job_rfd = dup (job_fds[0])) < 0) - { - if (errno != EBADF) -- pfatal_with_name (_("dup jobserver")); -+ pfatal_with_name_err (_("dup jobserver"), errno); - - error (NILF, - _("warning: jobserver unavailable: using -j1. Add '+' to parent make rule.")); -@@ -1787,13 +1787,13 @@ main (int argc, char **argv, char **envp - strcat (template, DEFAULT_TMPFILE); - outfile = output_tmpfile (&stdin_nm, template); - if (outfile == 0) -- pfatal_with_name (_("fopen (temporary file)")); -+ pfatal_with_name_err (_("fopen (temporary file)"), errno); - while (!feof (stdin) && ! ferror (stdin)) - { - char buf[2048]; - unsigned int n = fread (buf, 1, sizeof (buf), stdin); - if (n > 0 && fwrite (buf, 1, n, outfile) != n) -- pfatal_with_name (_("fwrite (temporary file)")); -+ pfatal_with_name_err (_("fwrite (temporary file)"), errno); - } - fclose (outfile); - -@@ -2030,7 +2030,8 @@ main (int argc, char **argv, char **envp - char c = '+'; - - if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0) -- pfatal_with_name (_("creating jobs pipe")); -+ pfatal_with_name_err (_("creating jobs pipe"), errno); -+ - #endif - - /* Every make assumes that it always has one job it can run. For the -@@ -2050,7 +2051,8 @@ main (int argc, char **argv, char **envp - - EINTRLOOP (r, write (job_fds[1], &c, 1)); - if (r != 1) -- pfatal_with_name (_("init jobserver pipe")); -+ pfatal_with_name_err (_("init jobserver pipe"), errno); -+ - } - #endif - -@@ -2474,7 +2476,7 @@ main (int argc, char **argv, char **envp - /* If there is a temp file from reading a makefile from stdin, get rid of - it now. */ - if (stdin_nm && unlink (stdin_nm) < 0 && errno != ENOENT) -- perror_with_name (_("unlink (temporary file): "), stdin_nm); -+ perror_with_name_err (_("unlink (temporary file): "), stdin_nm, errno); - - /* If there were no command-line goals, use the default. */ - if (goals == 0) -diff -Nrup a/makeint.h b/makeint.h ---- a/makeint.h 2014-02-03 17:49:03.265939424 -0500 -+++ b/makeint.h 2014-02-03 18:09:31.738695318 -0500 -@@ -436,6 +436,8 @@ void fatal (const gmk_floc *flocp, const - void die (int) __attribute__ ((noreturn)); - void pfatal_with_name (const char *) __attribute__ ((noreturn)); - void perror_with_name (const char *, const char *); -+void pfatal_with_name_err (const char *, int errnum) __attribute__ ((noreturn)); -+void perror_with_name_err (const char *, const char *, int errnum); - #define xstrlen(_s) ((_s)==NULL ? 0 : strlen (_s)) - void *xmalloc (unsigned int); - void *xcalloc (unsigned int); -diff -Nrup a/output.c b/output.c ---- a/output.c 2013-10-05 19:12:24.000000000 -0400 -+++ b/output.c 2014-02-03 18:22:48.617908701 -0500 -@@ -746,17 +746,31 @@ fatal (const gmk_floc *flocp, const char - /* Print an error message from errno. */ - - void -+perror_with_name_err (const char *str, const char *name, int errnum) -+{ -+ error (NILF, _("%s%s: %s"), str, name, strerror (errnum)); -+} -+ -+void - perror_with_name (const char *str, const char *name) - { -- error (NILF, _("%s%s: %s"), str, name, strerror (errno)); -+ perror_with_name_err (str, name, errno); - } - - /* Print an error message from errno and exit. */ - - void -+pfatal_with_name_err (const char *name, int errnum) -+{ -+ fatal (NILF, _("%s: %s"), name, strerror (errnum)); -+ -+ /* NOTREACHED */ -+} -+ -+void - pfatal_with_name (const char *name) - { -- fatal (NILF, _("%s: %s"), name, strerror (errno)); -+ pfatal_with_name_err (name, errno); - - /* NOTREACHED */ - } diff --git a/make/patches/make-4.0-j8k.patch b/make/patches/make-4.0-j8k.patch deleted file mode 100644 index 2ebcc5b..0000000 --- a/make/patches/make-4.0-j8k.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nrup a/main.c b/main.c ---- a/main.c 2013-10-09 00:22:40.000000000 -0400 -+++ b/main.c 2014-02-03 17:18:04.238609236 -0500 -@@ -1987,6 +1987,20 @@ main (int argc, char **argv, char **envp - } - #endif - -+#ifdef PIPE_BUF -+ if (job_slots > PIPE_BUF) -+#elif defined _POSIX_PIPE_BUF -+ if (job_slots > _POSIX_PIPE_BUF) -+#else -+ if (job_slots > 512) -+#endif -+ { -+ error (NILF, -+ _("More parallel jobs (-jN) than this platform can handle requested.")); -+ error (NILF, _("Resetting to single job (-j1) mode.")); -+ job_slots = 1; -+ } -+ - #ifdef MAKE_JOBSERVER - /* If we have >1 slot but no jobserver-fds, then we're a top-level make. - Set up the pipe and install the fds option for our children. */ diff --git a/mstpd/mstpd.nm b/mstpd/mstpd.nm index d6761a0..c899d6f 100644 --- a/mstpd/mstpd.nm +++ b/mstpd/mstpd.nm @@ -6,7 +6,7 @@ name = mstpd version = 0.01 svn_ver = 36 -release = 0.7-svn%{svn_ver}.1 +release = 0.7-svn%{svn_ver}.2 thisapp = %{name}-%{version}-svn%{svn_ver} groups = Networking/Tools @@ -24,7 +24,7 @@ end build # Compile for release. - make_build_targets += MODE=release + make_build_targets += MODE=release CC="gcc %{LDFLAGS}" install_cmds rm -vf %{BUILDROOT}/sbin/bridge-stp diff --git a/pcre/pcre.nm b/pcre/pcre.nm index 112df6a..f56c5d1 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -4,8 +4,8 @@ ############################################################################### name = pcre -version = 8.35 -release = 3 +version = 8.39 +release = 1 groups = System/Libraries url = http://www.pcre.org/ @@ -40,6 +40,7 @@ build --enable-pcretest-libreadline test + export LD_LIBRARY_PATH=$(pwd)/.libs make check end end diff --git a/rcs/patches/rcs-5.8-build-tweaks.patch b/rcs/patches/rcs-5.8-build-tweaks.patch index 130d452..d2f16bc 100644 --- a/rcs/patches/rcs-5.8-build-tweaks.patch +++ b/rcs/patches/rcs-5.8-build-tweaks.patch @@ -1,15 +1,15 @@ -diff -up rcs-5.8/man/Makefile.in.build-tweaks rcs-5.8/man/Makefile.in ---- rcs-5.8/man/Makefile.in.build-tweaks 2011-08-28 13:14:24.000000000 +0200 -+++ rcs-5.8/man/Makefile.in 2011-09-07 15:48:30.485492906 +0200 -@@ -876,9 +876,9 @@ top_build_prefix = @top_build_prefix@ +diff -up ./man/Makefile.in.build-tweaks ./man/Makefile.in +--- ./man/Makefile.in.build-tweaks 2013-05-06 09:28:45.000000000 +0200 ++++ ./man/Makefile.in 2013-05-10 23:03:36.975917262 +0200 +@@ -1237,9 +1237,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ dist_man_MANS = ci.1 co.1 ident.1 merge.1 rcs.1 rcsclean.1 \ -- rcsdiff.1 rcsfile.5 rcsintro.1 rcsmerge.1 rlog.1 -+ rcsdiff.1 rcsfile.5 rcsintro.1 rcsmerge.1 rlog.1 rcsfreeze.1 +- rcsdiff.1 rcsfile.5 rcsmerge.1 rlog.1 ++ rcsdiff.1 rcsfile.5 rcsmerge.1 rlog.1 rcsfreeze.1 -dist_noinst_MANS = rcsfreeze.1 -+#dist_noinst_MANS = ++#dist_noinst_MANS = rcsfreeze.1 BUILT_SOURCES = REL $(dist_noinst_MANS) bits = b-base \ b-emptylogmessage \ diff --git a/rcs/patches/rcs-5.8-newsvnsyntax.patch b/rcs/patches/rcs-5.8-newsvnsyntax.patch deleted file mode 100644 index c63f884..0000000 --- a/rcs/patches/rcs-5.8-newsvnsyntax.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up rcs-5.8/src/ident.c.newsvnsyntax rcs-5.8/src/ident.c ---- rcs-5.8/src/ident.c.newsvnsyntax 2011-01-07 13:27:18.000000000 +0100 -+++ rcs-5.8/src/ident.c 2011-09-08 10:53:34.064837699 +0200 -@@ -41,14 +41,20 @@ match (register FILE *fp) - char line[BUFSIZ]; - register int c; - register char *tp; -+ int COLON_C = 0; -+ int MAX_COLON = 1; - - tp = line; -- while ((c = getc (fp)) != VDELIM) -+ while ((c = getc (fp)) && (COLON_C < MAX_COLON)) - { - if (c == EOF && feof (fp) | ferror (fp)) - return c; - switch (ctab[c]) - { -+ case COLON: -+ *tp++ = c; -+ COLON_C++; -+ break; - case LETTER: - case Letter: - *tp++ = c; -@@ -62,7 +68,15 @@ match (register FILE *fp) - } - if (tp == line) - return c; -- *tp++ = c; -+ if (c == ' ') -+ { -+ ungetc(c,fp); -+ } -+ else -+ { -+ *tp++ = c; -+ } -+ - if ((c = getc (fp)) != ' ') - return c ? c : '\n'; - *tp++ = c; diff --git a/rcs/patches/rcs-5.8-sameuserlocks.patch b/rcs/patches/rcs-5.8-sameuserlocks.patch deleted file mode 100644 index d5696be..0000000 --- a/rcs/patches/rcs-5.8-sameuserlocks.patch +++ /dev/null @@ -1,198 +0,0 @@ -diff -up rcs-5.8/man/co.1in.sameuserlocks rcs-5.8/man/co.1in ---- rcs-5.8/man/co.1in.sameuserlocks 2011-01-07 13:27:18.000000000 +0100 -+++ rcs-5.8/man/co.1in 2011-09-08 11:41:09.545810466 +0200 -@@ -318,6 +318,10 @@ Use this option with care; it can confus - retrieves the latest revision on the selected branch whose state is set to - .IR state . - .TP -+.BI \-S -+Turns on same user locks. When this is enabled the user cannot check out -+the same file twice. -+.TP - .B \-T - Preserve the modification time on the \*o - even if the \*o changes because a lock is added or removed. -diff -up rcs-5.8/src/b-excwho.c.sameuserlocks rcs-5.8/src/b-excwho.c ---- rcs-5.8/src/b-excwho.c.sameuserlocks 2011-01-07 13:27:18.000000000 +0100 -+++ rcs-5.8/src/b-excwho.c 2011-09-08 11:41:09.546810466 +0200 -@@ -205,9 +205,9 @@ getcaller (void) - } - - bool --caller_login_p (char const *login) -+caller_login_p (char const *login, int sameuserlocks) - { -- return STR_SAME (getcaller (), login); -+ return STR_SAME (getcaller (), login) && !sameuserlocks; - } - - struct link * -@@ -255,7 +255,7 @@ lock_drop (struct link *box, struct link - } - - int --addlock (struct delta *delta, bool verbose) -+addlock (struct delta *delta, bool verbose, int sameuserlocks) - /* Add a lock held by caller to ‘delta’ and return 1 if successful. - Print an error message if ‘verbose’ and return -1 if no lock is - added because ‘delta’ is locked by somebody other than caller. -@@ -266,7 +266,7 @@ addlock (struct delta *delta, bool verbo - - if (was) - { -- if (caller_login_p (was->login)) -+ if (caller_login_p (was->login, sameuserlocks)) - return 0; - if (verbose) - RERR ("Revision %s is already locked by %s.", delta->num, was->login); -diff -up rcs-5.8/src/b-excwho.h.sameuserlocks rcs-5.8/src/b-excwho.h ---- rcs-5.8/src/b-excwho.h.sameuserlocks 2011-01-07 13:27:18.000000000 +0100 -+++ rcs-5.8/src/b-excwho.h 2011-09-08 11:43:06.424809351 +0200 -@@ -27,11 +27,11 @@ extern void seteid (void); - extern void setrid (void); - extern char const *getusername (bool suspicious); - extern char const *getcaller (void); --extern bool caller_login_p (char const *login); -+extern bool caller_login_p (char const *login, int sameuserlocks); - extern struct link *lock_memq (struct link *ls, bool loginp, void const *x); - extern struct rcslock const *lock_on (struct delta const *delta); - extern void lock_drop (struct link *box, struct link *tp); --extern int addlock (struct delta *delta, bool verbose); -+extern int addlock (struct delta *delta, bool verbose, int sameuserlocks); - - /* Idioms. */ - -diff -up rcs-5.8/src/ci.c.sameuserlocks rcs-5.8/src/ci.c ---- rcs-5.8/src/ci.c.sameuserlocks 2011-08-08 14:00:25.000000000 +0200 -+++ rcs-5.8/src/ci.c 2011-09-08 11:41:09.585810465 +0200 -@@ -153,7 +153,7 @@ removelock (struct delta *delta) - return -1; - } - rl = tp->next->entry; -- if (! caller_login_p (rl->login)) -+ if (! caller_login_p (rl->login, false)) - { - RERR ("revision %s locked by %s", num, rl->login); - return -1; -@@ -260,7 +260,7 @@ addbranch (struct delta *branchpoint, st - newbranch.entry = &newdelta; - newdelta.ilk = NULL; - if (branchpoint->lockedby) -- if (caller_login_p (branchpoint->lockedby)) -+ if (caller_login_p (branchpoint->lockedby, false)) - return removelock (branchpoint); /* This returns 1. */ - return removedlock; - } -@@ -1006,7 +1006,7 @@ main (int argc, char **argv) - continue; - } - -- if (lockflag && addlock (&newdelta, true) < 0) -+ if (lockflag && addlock (&newdelta, true, false) < 0) - continue; - - if (keepflag && (pv = PREV (name))) -diff -up rcs-5.8/src/co.c.sameuserlocks rcs-5.8/src/co.c ---- rcs-5.8/src/co.c.sameuserlocks 2011-08-08 14:00:25.000000000 +0200 -+++ rcs-5.8/src/co.c 2011-09-08 11:41:09.587810465 +0200 -@@ -135,7 +135,7 @@ rmlock (struct delta const *delta) - /* No lock on ‘delta’. */ - return 0; - rl = tp->next->entry; -- if (!caller_login_p (rl->login)) -+ if (!caller_login_p (rl->login, false)) - /* Found a lock on ‘delta’ by someone else. */ - { - RERR ("revision %s locked by %s; use co -r or rcs -u", -@@ -441,6 +441,7 @@ main (int argc, char **argv) - int changelock; - int expmode, r, workstatstat; - bool tostdout, Ttimeflag; -+ int sameuserlocks; - char finaldate[datesize]; - #if OPEN_O_BINARY - int stdout_mode = 0; -@@ -464,6 +465,7 @@ main (int argc, char **argv) - BE (pe) = X_DEFAULT; - tostdout = false; - Ttimeflag = false; -+ sameuserlocks = false; - - argc = getRCSINIT (argc, argv, &newargv); - argv = newargv; -@@ -543,6 +545,14 @@ main (int argc, char **argv) - } - break; - -+ case 'S': -+ /* -+ * Enable strict locks (i.e. even the same user cannot -+ * re-check out a file with a lock that he owns. -+ */ -+ sameuserlocks = true; -+ break; -+ - case 'T': - if (*a) - goto unknown; -@@ -699,7 +709,7 @@ main (int argc, char **argv) - /* Check reservations. */ - changelock = lockflag < 0 - ? rmlock (targetdelta) -- : lockflag == 0 ? 0 : addlock (targetdelta, true); -+ : lockflag == 0 ? 0 : addlock (targetdelta, true, sameuserlocks); - - if (changelock < 0 - || (changelock && !checkaccesslist ()) -diff -up rcs-5.8/src/rcsclean.c.sameuserlocks rcs-5.8/src/rcsclean.c ---- rcs-5.8/src/rcsclean.c.sameuserlocks 2011-08-08 14:00:25.000000000 +0200 -+++ rcs-5.8/src/rcsclean.c 2011-09-08 11:41:09.588810465 +0200 -@@ -66,7 +66,7 @@ unlock (struct delta *delta) - struct link box, *tp; - - if (delta && delta->lockedby -- && caller_login_p (delta->lockedby) -+ && caller_login_p (delta->lockedby, false) - && (box.next = GROK (locks)) - && (tp = lock_delta_memq (&box, delta))) - { -diff -up rcs-5.8/src/rcs.c.sameuserlocks rcs-5.8/src/rcs.c ---- rcs-5.8/src/rcs.c.sameuserlocks 2011-08-08 13:58:59.000000000 +0200 -+++ rcs-5.8/src/rcs.c 2011-09-08 11:41:09.590810465 +0200 -@@ -495,7 +495,7 @@ breaklock (struct delta const *delta) - } - rl = tp->next->entry; - before = rl->login; -- if (!caller_login_p (before) -+ if (!caller_login_p (before, false) - && !sendmail (num, before)) - { - RERR ("revision %s still locked by %s", num, before); -@@ -794,8 +794,8 @@ setlock (char const *rev, struct wlink * - RERR ("can't lock nonexisting revision %s", numrev.string); - else - { -- if ((r = addlock (target, false)) < 0 && breaklock (target)) -- r = addlock (target, true); -+ if ((r = addlock (target, false, false)) < 0 && breaklock (target)) -+ r = addlock (target, true, false); - if (0 <= r) - { - if (r) -diff -up rcs-5.8/src/rcsedit.c.sameuserlocks rcs-5.8/src/rcsedit.c ---- rcs-5.8/src/rcsedit.c.sameuserlocks 2011-08-08 14:00:25.000000000 +0200 -+++ rcs-5.8/src/rcsedit.c 2011-09-08 11:41:09.591810465 +0200 -@@ -1086,11 +1086,11 @@ checkaccesslist (void) - { - struct link *ls = GROK (access); - -- if (!ls || stat_mine_p (&REPO (stat)) || caller_login_p ("root")) -+ if (!ls || stat_mine_p (&REPO (stat)) || caller_login_p ("root", false)) - return true; - - for (; ls; ls = ls->next) -- if (caller_login_p (ls->entry)) -+ if (caller_login_p (ls->entry, false)) - return true; - - RERR ("user %s not on the access list", getcaller ()); diff --git a/rcs/rcs.nm b/rcs/rcs.nm index 85b9e00..f5eb07a 100644 --- a/rcs/rcs.nm +++ b/rcs/rcs.nm @@ -4,7 +4,7 @@ ############################################################################### name = rcs -version = 5.8 +version = 5.9.4 release = 1 groups = Development/Tools @@ -24,6 +24,7 @@ description end source_dl = ftp://ftp.gnu.org/gnu/rcs/ +sources = %{thisapp}.tar.xz build requires @@ -40,9 +41,9 @@ build configure_options += \ --with-diffutils - #test - # make check - #end + test + make check + end install_cmds # Install the rcsfreeze command. diff --git a/rtorrent/rtorrent.nm b/rtorrent/rtorrent.nm deleted file mode 100644 index 6f3f379..0000000 --- a/rtorrent/rtorrent.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = rtorrent -version = 0.8.9 -release = 1 - -groups = Internet/P2P -url = http://libtorrent.rakshasa.no/ -license = GPLv3 -summary = BitTorrent client based on libtorrent. - -description - A BitTorrent client using libtorrent, which on high-bandwidth connections is - able to seed at 3 times the speed of the official client. Using - ncurses its ideal for use with screen or dtach. It supports - saving of sessions and allows the user to add and remove torrents and scanning - of directories for torrent files to seed and/or download. -end - -source_dl = http://libtorrent.rakshasa.no/downloads/ - -build - requires - gcc-c++ - libcurl-devel - libsigc++-devel - libtorrent-devel >= 0.12.9 - ncurses-devel - end - - CFLAGS += -fno-strict-aliasing - - make_build_targets += LDFLAGS=-lpthread -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/vlan/vlan.nm b/vlan/vlan.nm deleted file mode 100644 index 6ee0ebe..0000000 --- a/vlan/vlan.nm +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = vlan -version = 1.9 -release = 2 - -groups = Networking/Tools -url = http://www.candelatech.com/~greear/vlan.html -license = GPLv2+ -summary = Linux 802.1q VLAN configuration utility. - -description - The vconfig program configures and adjusts 802.1q VLAN parameters. -end - -source_dl = http://www.candelatech.com/~greear/vlan/ - -DIR_APP = %{DIR_SRC}/%{name} - -build - # Parallelism cannot be used here. - PARALLELISMFLAGS = -j1 - - prepare_cmds - make purge - end - - make_build_targets = vconfig CCFLAGS="%{CFLAGS}" STRIP=/bin/true - - install - mkdir -pv %{BUILDROOT}%{sbindir} - install -D -m 0755 vconfig %{BUILDROOT}%{sbindir} - - mkdir -pv %{BUILDROOT}%{mandir}/man8 - install -D -m 0644 vconfig.8 %{BUILDROOT}%{mandir}/man8 - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. eb3c09082c405020e1f1965179fda73a071f99d2
by git＠ipfire.org 27 Sep '16

27 Sep '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via eb3c09082c405020e1f1965179fda73a071f99d2 (commit) from 5ac2ac488c809beafa6443e0410e573fb1be92b2 (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 eb3c09082c405020e1f1965179fda73a071f99d2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 13:13:12 2016 +0100 dos2unix: Update to 7.3.4 Also make the build honour LDFLAGS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: dos2unix/dos2unix.nm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) Difference in files: diff --git a/dos2unix/dos2unix.nm b/dos2unix/dos2unix.nm index 70d09a1..23a34e8 100644 --- a/dos2unix/dos2unix.nm +++ b/dos2unix/dos2unix.nm @@ -4,7 +4,7 @@ ############################################################################### name = dos2unix -version = 7.3.3 +version = 7.3.4 release = 1 groups = Applications/Text @@ -24,19 +24,14 @@ build gettext end - prepare_cmds - rm -rvf po/*/eo-x.* - end - build make %{PARALLELISMFLAGS} \ - CFLAGS="%{CFLAGS} -D_LARGEFILE_SOURCE $(getconf LFS_CFLAGS)" + CFLAGS_USER="%{CFLAGS}" LDFLAGS_USER="%{LDFLAGS}" end end packages package %{name} - end package %{name}-debuginfo template DEBUGINFO hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 92aebbcddd16a0969ab5c2f5fcd4d7217a68e3e4
by git＠ipfire.org 27 Sep '16

27 Sep '16

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 92aebbcddd16a0969ab5c2f5fcd4d7217a68e3e4 (commit) from 01176164b5c1989cf37afad36fe967ddfe0f3612 (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 92aebbcddd16a0969ab5c2f5fcd4d7217a68e3e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 27 09:44:19 2016 +0100 Revert "libjpeg: update to 1.4.2" This reverts commit feba68e4af48630d0c5dcd16bd799a0e02db2b36. Breaks building netpbm Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libjpeg | 19 +---- config/rootfiles/common/libjpeg-compat | 3 - config/rootfiles/core/106/filelists/libjpeg | 1 - config/rootfiles/core/106/filelists/libjpeg-compat | 1 - lfs/libjpeg | 14 ++-- lfs/libjpeg-compat | 80 ---------------------- make.sh | 1 - 7 files changed, 9 insertions(+), 110 deletions(-) delete mode 100644 config/rootfiles/common/libjpeg-compat delete mode 120000 config/rootfiles/core/106/filelists/libjpeg delete mode 120000 config/rootfiles/core/106/filelists/libjpeg-compat delete mode 100644 lfs/libjpeg-compat Difference in files: diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg index 4df7565..7ceb697 100644 --- a/config/rootfiles/common/libjpeg +++ b/config/rootfiles/common/libjpeg @@ -12,13 +12,13 @@ #usr/lib/libjpeg.a #usr/lib/libjpeg.la #usr/lib/libjpeg.so -usr/lib/libjpeg.so.8 -usr/lib/libjpeg.so.8.0.2 +usr/lib/libjpeg.so.62 +usr/lib/libjpeg.so.62.1.0 #usr/lib/libturbojpeg.a #usr/lib/libturbojpeg.la #usr/lib/libturbojpeg.so usr/lib/libturbojpeg.so.0 -usr/lib/libturbojpeg.so.0.1.0 +usr/lib/libturbojpeg.so.0.0.0 #usr/man/man1/cjpeg.1 #usr/man/man1/djpeg.1 #usr/man/man1/jpegtran.1 @@ -31,16 +31,3 @@ usr/lib/libturbojpeg.so.0.1.0 #usr/share/doc/structure.txt #usr/share/doc/usage.txt #usr/share/doc/wizard.txt -#usr/share/man/man1/cjpeg.1 -#usr/share/man/man1/djpeg.1 -#usr/share/man/man1/jpegtran.1 -#usr/share/man/man1/rdjpgcom.1 -#usr/share/man/man1/wrjpgcom.1 -#usr/share/doc/libjpeg-turbo -#usr/share/doc/libjpeg-turbo/README -#usr/share/doc/libjpeg-turbo/README-turbo.txt -#usr/share/doc/libjpeg-turbo/example.c -#usr/share/doc/libjpeg-turbo/libjpeg.txt -#usr/share/doc/libjpeg-turbo/structure.txt -#usr/share/doc/libjpeg-turbo/usage.txt -#usr/share/doc/libjpeg-turbo/wizard.txt diff --git a/config/rootfiles/common/libjpeg-compat b/config/rootfiles/common/libjpeg-compat deleted file mode 100644 index 5e7b98d..0000000 --- a/config/rootfiles/common/libjpeg-compat +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libjpeg.so.62 -usr/lib/libjpeg.so.62.1.0 -usr/lib/libturbojpeg.so.0.0.0 diff --git a/config/rootfiles/core/106/filelists/libjpeg b/config/rootfiles/core/106/filelists/libjpeg deleted file mode 120000 index 3b1a782..0000000 --- a/config/rootfiles/core/106/filelists/libjpeg +++ /dev/null @@ -1 +0,0 @@ -../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libjpeg-compat b/config/rootfiles/core/106/filelists/libjpeg-compat deleted file mode 120000 index e6ff86d..0000000 --- a/config/rootfiles/core/106/filelists/libjpeg-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/libjpeg-compat \ No newline at end of file diff --git a/lfs/libjpeg b/lfs/libjpeg index aae2c77..8b4c077 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2015 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 # @@ -24,13 +24,15 @@ include Config -VER = 1.4.2 +VER = 1.3.1 THISAPP = libjpeg-turbo-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libjpeg +PAK_VER = ipfire-beta1 ############################################################################### # Top-level Rules @@ -40,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 86b0d5f7507c2e6c21c00219162c3c44 +$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05 install : $(TARGET) @@ -70,13 +72,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr \ - --with-jpeg8 \ - --disable-static\ - --mandir=/usr/share/man + cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) - diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat deleted file mode 100644 index 4166d52..0000000 --- a/lfs/libjpeg-compat +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.3.1 - -THISAPP = libjpeg-turbo-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libjpeg -PAK_VER = ipfire-beta1 - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared - cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && mv -vf .libs/{libjpeg.so.62.1.0,libjpeg.so.62,libturbojpeg.so.0.0.0} /usr/lib/ - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 5e97c96..5a2c6da 100755 --- a/make.sh +++ b/make.sh @@ -508,7 +508,6 @@ buildipfire() { ipfiremake libidn ipfiremake nasm ipfiremake libjpeg - ipfiremake libjpeg-compat ipfiremake libexif ipfiremake libpng ipfiremake libtiff hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 01176164b5c1989cf37afad36fe967ddfe0f3612
by git＠ipfire.org 26 Sep '16

26 Sep '16

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 01176164b5c1989cf37afad36fe967ddfe0f3612 (commit) via de48b89ca140fff432754ef8e83c9c5acbd717fe (commit) from e26a93322da5dc6d0c1537c0122b24a6dd63119d (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 01176164b5c1989cf37afad36fe967ddfe0f3612 Merge: de48b89 e26a933 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 26 23:18:30 2016 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit de48b89ca140fff432754ef8e83c9c5acbd717fe Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 26 18:55:51 2016 +0200 Revert "Revert "tcl: update to 8.6.6"" with new krb5 also the tcl update works. This reverts commit 053c554822e9d7342bf21535ccae4812100f94c5. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/tcl | 666 ++++++++++++++++++++++++++++++++++++-------- lfs/tcl | 10 +- 2 files changed, 548 insertions(+), 128 deletions(-) Difference in files: diff --git a/config/rootfiles/common/tcl b/config/rootfiles/common/tcl index 7b6bb83..c4232d2 100644 --- a/config/rootfiles/common/tcl +++ b/config/rootfiles/common/tcl @@ -1,117 +1,305 @@ +#usr/bin/sqlite3_analyzer usr/bin/tclsh -usr/bin/tclsh8.4 +usr/bin/tclsh8.6 +#usr/include/fakemysql.h +#usr/include/fakepq.h +#usr/include/fakesql.h +#usr/include/itcl.h +#usr/include/itcl2TclOO.h +#usr/include/itclDecls.h +#usr/include/itclInt.h +#usr/include/itclIntDecls.h +#usr/include/itclMigrate2TclCore.h +#usr/include/itclTclIntStubsFcn.h +#usr/include/mysqlStubs.h +#usr/include/odbcStubs.h +#usr/include/pqStubs.h #usr/include/tcl.h #usr/include/tclDecls.h +#usr/include/tclOO.h +#usr/include/tclOODecls.h #usr/include/tclPlatDecls.h -usr/lib/libtcl8.4.so -usr/lib/libtclstub8.4.a -#usr/lib/tcl8.4 -usr/lib/tcl8.4/auto.tcl -#usr/lib/tcl8.4/encoding -usr/lib/tcl8.4/encoding/ascii.enc -usr/lib/tcl8.4/encoding/big5.enc -usr/lib/tcl8.4/encoding/cp1250.enc -usr/lib/tcl8.4/encoding/cp1251.enc -usr/lib/tcl8.4/encoding/cp1252.enc -usr/lib/tcl8.4/encoding/cp1253.enc -usr/lib/tcl8.4/encoding/cp1254.enc -usr/lib/tcl8.4/encoding/cp1255.enc -usr/lib/tcl8.4/encoding/cp1256.enc -usr/lib/tcl8.4/encoding/cp1257.enc -usr/lib/tcl8.4/encoding/cp1258.enc -usr/lib/tcl8.4/encoding/cp437.enc -usr/lib/tcl8.4/encoding/cp737.enc -usr/lib/tcl8.4/encoding/cp775.enc -usr/lib/tcl8.4/encoding/cp850.enc -usr/lib/tcl8.4/encoding/cp852.enc -usr/lib/tcl8.4/encoding/cp855.enc -usr/lib/tcl8.4/encoding/cp857.enc -usr/lib/tcl8.4/encoding/cp860.enc -usr/lib/tcl8.4/encoding/cp861.enc -usr/lib/tcl8.4/encoding/cp862.enc -usr/lib/tcl8.4/encoding/cp863.enc -usr/lib/tcl8.4/encoding/cp864.enc -usr/lib/tcl8.4/encoding/cp865.enc -usr/lib/tcl8.4/encoding/cp866.enc -usr/lib/tcl8.4/encoding/cp869.enc -usr/lib/tcl8.4/encoding/cp874.enc -usr/lib/tcl8.4/encoding/cp932.enc -usr/lib/tcl8.4/encoding/cp936.enc -usr/lib/tcl8.4/encoding/cp949.enc -usr/lib/tcl8.4/encoding/cp950.enc -usr/lib/tcl8.4/encoding/dingbats.enc -usr/lib/tcl8.4/encoding/ebcdic.enc -usr/lib/tcl8.4/encoding/euc-cn.enc -usr/lib/tcl8.4/encoding/euc-jp.enc -usr/lib/tcl8.4/encoding/euc-kr.enc -usr/lib/tcl8.4/encoding/gb12345.enc -usr/lib/tcl8.4/encoding/gb1988.enc -usr/lib/tcl8.4/encoding/gb2312-raw.enc -usr/lib/tcl8.4/encoding/gb2312.enc -usr/lib/tcl8.4/encoding/iso2022-jp.enc -usr/lib/tcl8.4/encoding/iso2022-kr.enc -usr/lib/tcl8.4/encoding/iso2022.enc -usr/lib/tcl8.4/encoding/iso8859-1.enc -usr/lib/tcl8.4/encoding/iso8859-10.enc -usr/lib/tcl8.4/encoding/iso8859-13.enc -usr/lib/tcl8.4/encoding/iso8859-14.enc -usr/lib/tcl8.4/encoding/iso8859-15.enc -usr/lib/tcl8.4/encoding/iso8859-16.enc -usr/lib/tcl8.4/encoding/iso8859-2.enc -usr/lib/tcl8.4/encoding/iso8859-3.enc -usr/lib/tcl8.4/encoding/iso8859-4.enc -usr/lib/tcl8.4/encoding/iso8859-5.enc -usr/lib/tcl8.4/encoding/iso8859-6.enc -usr/lib/tcl8.4/encoding/iso8859-7.enc -usr/lib/tcl8.4/encoding/iso8859-8.enc -usr/lib/tcl8.4/encoding/iso8859-9.enc -usr/lib/tcl8.4/encoding/jis0201.enc -usr/lib/tcl8.4/encoding/jis0208.enc -usr/lib/tcl8.4/encoding/jis0212.enc -usr/lib/tcl8.4/encoding/koi8-r.enc -usr/lib/tcl8.4/encoding/koi8-u.enc -usr/lib/tcl8.4/encoding/ksc5601.enc -usr/lib/tcl8.4/encoding/macCentEuro.enc -usr/lib/tcl8.4/encoding/macCroatian.enc -usr/lib/tcl8.4/encoding/macCyrillic.enc -usr/lib/tcl8.4/encoding/macDingbats.enc -usr/lib/tcl8.4/encoding/macGreek.enc -usr/lib/tcl8.4/encoding/macIceland.enc -usr/lib/tcl8.4/encoding/macJapan.enc -usr/lib/tcl8.4/encoding/macRoman.enc -usr/lib/tcl8.4/encoding/macRomania.enc -usr/lib/tcl8.4/encoding/macThai.enc -usr/lib/tcl8.4/encoding/macTurkish.enc -usr/lib/tcl8.4/encoding/macUkraine.enc -usr/lib/tcl8.4/encoding/shiftjis.enc -usr/lib/tcl8.4/encoding/symbol.enc -usr/lib/tcl8.4/encoding/tis-620.enc -usr/lib/tcl8.4/history.tcl -#usr/lib/tcl8.4/http1.0 -usr/lib/tcl8.4/http1.0/http.tcl -usr/lib/tcl8.4/http1.0/pkgIndex.tcl -#usr/lib/tcl8.4/http2.5 -usr/lib/tcl8.4/http2.5/http.tcl -usr/lib/tcl8.4/http2.5/pkgIndex.tcl -usr/lib/tcl8.4/init.tcl -usr/lib/tcl8.4/ldAix -usr/lib/tcl8.4/ldAout.tcl -#usr/lib/tcl8.4/msgcat1.3 -usr/lib/tcl8.4/msgcat1.3/msgcat.tcl -usr/lib/tcl8.4/msgcat1.3/pkgIndex.tcl -#usr/lib/tcl8.4/opt0.4 -usr/lib/tcl8.4/opt0.4/optparse.tcl -usr/lib/tcl8.4/opt0.4/pkgIndex.tcl -usr/lib/tcl8.4/package.tcl -usr/lib/tcl8.4/parray.tcl -usr/lib/tcl8.4/safe.tcl -usr/lib/tcl8.4/tclAppInit.c -usr/lib/tcl8.4/tclIndex -#usr/lib/tcl8.4/tcltest2.2 -usr/lib/tcl8.4/tcltest2.2/pkgIndex.tcl -usr/lib/tcl8.4/tcltest2.2/tcltest.tcl -usr/lib/tcl8.4/word.tcl +#usr/include/tclThread.h +#usr/include/tclTomMath.h +#usr/include/tclTomMathDecls.h +#usr/include/tdbc.h +#usr/include/tdbcDecls.h +#usr/include/tdbcInt.h +#usr/lib/itcl4.0.5 +usr/lib/itcl4.0.5/itcl.tcl +usr/lib/itcl4.0.5/itclConfig.sh +usr/lib/itcl4.0.5/itclHullCmds.tcl +usr/lib/itcl4.0.5/itclWidget.tcl +usr/lib/itcl4.0.5/libitcl4.0.5.so +usr/lib/itcl4.0.5/libitclstub4.0.5.a +usr/lib/itcl4.0.5/pkgIndex.tcl +usr/lib/libtcl8.6.so +#usr/lib/libtclstub8.6.a +#usr/lib/pkgconfig/tcl.pc +#usr/lib/sqlite3.13.0 +usr/lib/sqlite3.13.0/libsqlite3.13.0.so +usr/lib/sqlite3.13.0/pkgIndex.tcl +#usr/lib/tcl8 +#usr/lib/tcl8.6 +usr/lib/tcl8.6/auto.tcl +usr/lib/tcl8.6/clock.tcl +usr/lib/tcl8.6/encoding +usr/lib/tcl8.6/encoding/ascii.enc +usr/lib/tcl8.6/encoding/big5.enc +usr/lib/tcl8.6/encoding/cp1250.enc +usr/lib/tcl8.6/encoding/cp1251.enc +usr/lib/tcl8.6/encoding/cp1252.enc +usr/lib/tcl8.6/encoding/cp1253.enc +usr/lib/tcl8.6/encoding/cp1254.enc +usr/lib/tcl8.6/encoding/cp1255.enc +usr/lib/tcl8.6/encoding/cp1256.enc +usr/lib/tcl8.6/encoding/cp1257.enc +usr/lib/tcl8.6/encoding/cp1258.enc +usr/lib/tcl8.6/encoding/cp437.enc +usr/lib/tcl8.6/encoding/cp737.enc +usr/lib/tcl8.6/encoding/cp775.enc +usr/lib/tcl8.6/encoding/cp850.enc +usr/lib/tcl8.6/encoding/cp852.enc +usr/lib/tcl8.6/encoding/cp855.enc +usr/lib/tcl8.6/encoding/cp857.enc +usr/lib/tcl8.6/encoding/cp860.enc +usr/lib/tcl8.6/encoding/cp861.enc +usr/lib/tcl8.6/encoding/cp862.enc +usr/lib/tcl8.6/encoding/cp863.enc +usr/lib/tcl8.6/encoding/cp864.enc +usr/lib/tcl8.6/encoding/cp865.enc +usr/lib/tcl8.6/encoding/cp866.enc +usr/lib/tcl8.6/encoding/cp869.enc +usr/lib/tcl8.6/encoding/cp874.enc +usr/lib/tcl8.6/encoding/cp932.enc +usr/lib/tcl8.6/encoding/cp936.enc +usr/lib/tcl8.6/encoding/cp949.enc +usr/lib/tcl8.6/encoding/cp950.enc +usr/lib/tcl8.6/encoding/dingbats.enc +usr/lib/tcl8.6/encoding/ebcdic.enc +usr/lib/tcl8.6/encoding/euc-cn.enc +usr/lib/tcl8.6/encoding/euc-jp.enc +usr/lib/tcl8.6/encoding/euc-kr.enc +usr/lib/tcl8.6/encoding/gb12345.enc +usr/lib/tcl8.6/encoding/gb1988.enc +usr/lib/tcl8.6/encoding/gb2312-raw.enc +usr/lib/tcl8.6/encoding/gb2312.enc +usr/lib/tcl8.6/encoding/iso2022-jp.enc +usr/lib/tcl8.6/encoding/iso2022-kr.enc +usr/lib/tcl8.6/encoding/iso2022.enc +usr/lib/tcl8.6/encoding/iso8859-1.enc +usr/lib/tcl8.6/encoding/iso8859-10.enc +usr/lib/tcl8.6/encoding/iso8859-13.enc +usr/lib/tcl8.6/encoding/iso8859-14.enc +usr/lib/tcl8.6/encoding/iso8859-15.enc +usr/lib/tcl8.6/encoding/iso8859-16.enc +usr/lib/tcl8.6/encoding/iso8859-2.enc +usr/lib/tcl8.6/encoding/iso8859-3.enc +usr/lib/tcl8.6/encoding/iso8859-4.enc +usr/lib/tcl8.6/encoding/iso8859-5.enc +usr/lib/tcl8.6/encoding/iso8859-6.enc +usr/lib/tcl8.6/encoding/iso8859-7.enc +usr/lib/tcl8.6/encoding/iso8859-8.enc +usr/lib/tcl8.6/encoding/iso8859-9.enc +usr/lib/tcl8.6/encoding/jis0201.enc +usr/lib/tcl8.6/encoding/jis0208.enc +usr/lib/tcl8.6/encoding/jis0212.enc +usr/lib/tcl8.6/encoding/koi8-r.enc +usr/lib/tcl8.6/encoding/koi8-u.enc +usr/lib/tcl8.6/encoding/ksc5601.enc +usr/lib/tcl8.6/encoding/macCentEuro.enc +usr/lib/tcl8.6/encoding/macCroatian.enc +usr/lib/tcl8.6/encoding/macCyrillic.enc +usr/lib/tcl8.6/encoding/macDingbats.enc +usr/lib/tcl8.6/encoding/macGreek.enc +usr/lib/tcl8.6/encoding/macIceland.enc +usr/lib/tcl8.6/encoding/macJapan.enc +usr/lib/tcl8.6/encoding/macRoman.enc +usr/lib/tcl8.6/encoding/macRomania.enc +usr/lib/tcl8.6/encoding/macThai.enc +usr/lib/tcl8.6/encoding/macTurkish.enc +usr/lib/tcl8.6/encoding/macUkraine.enc +usr/lib/tcl8.6/encoding/shiftjis.enc +usr/lib/tcl8.6/encoding/symbol.enc +usr/lib/tcl8.6/encoding/tis-620.enc +usr/lib/tcl8.6/history.tcl +usr/lib/tcl8.6/http1.0 +usr/lib/tcl8.6/http1.0/http.tcl +usr/lib/tcl8.6/http1.0/pkgIndex.tcl +usr/lib/tcl8.6/init.tcl +#usr/lib/tcl8.6/msgs +#usr/lib/tcl8.6/msgs/af.msg +#usr/lib/tcl8.6/msgs/af_za.msg +#usr/lib/tcl8.6/msgs/ar.msg +#usr/lib/tcl8.6/msgs/ar_in.msg +#usr/lib/tcl8.6/msgs/ar_jo.msg +#usr/lib/tcl8.6/msgs/ar_lb.msg +#usr/lib/tcl8.6/msgs/ar_sy.msg +#usr/lib/tcl8.6/msgs/be.msg +#usr/lib/tcl8.6/msgs/bg.msg +#usr/lib/tcl8.6/msgs/bn.msg +#usr/lib/tcl8.6/msgs/bn_in.msg +#usr/lib/tcl8.6/msgs/ca.msg +#usr/lib/tcl8.6/msgs/cs.msg +#usr/lib/tcl8.6/msgs/da.msg +#usr/lib/tcl8.6/msgs/de.msg +#usr/lib/tcl8.6/msgs/de_at.msg +#usr/lib/tcl8.6/msgs/de_be.msg +#usr/lib/tcl8.6/msgs/el.msg +#usr/lib/tcl8.6/msgs/en_au.msg +#usr/lib/tcl8.6/msgs/en_be.msg +#usr/lib/tcl8.6/msgs/en_bw.msg +#usr/lib/tcl8.6/msgs/en_ca.msg +#usr/lib/tcl8.6/msgs/en_gb.msg +#usr/lib/tcl8.6/msgs/en_hk.msg +#usr/lib/tcl8.6/msgs/en_ie.msg +#usr/lib/tcl8.6/msgs/en_in.msg +#usr/lib/tcl8.6/msgs/en_nz.msg +#usr/lib/tcl8.6/msgs/en_ph.msg +#usr/lib/tcl8.6/msgs/en_sg.msg +#usr/lib/tcl8.6/msgs/en_za.msg +#usr/lib/tcl8.6/msgs/en_zw.msg +#usr/lib/tcl8.6/msgs/eo.msg +#usr/lib/tcl8.6/msgs/es.msg +#usr/lib/tcl8.6/msgs/es_ar.msg +#usr/lib/tcl8.6/msgs/es_bo.msg +#usr/lib/tcl8.6/msgs/es_cl.msg +#usr/lib/tcl8.6/msgs/es_co.msg +#usr/lib/tcl8.6/msgs/es_cr.msg +#usr/lib/tcl8.6/msgs/es_do.msg +#usr/lib/tcl8.6/msgs/es_ec.msg +#usr/lib/tcl8.6/msgs/es_gt.msg +#usr/lib/tcl8.6/msgs/es_hn.msg +#usr/lib/tcl8.6/msgs/es_mx.msg +#usr/lib/tcl8.6/msgs/es_ni.msg +#usr/lib/tcl8.6/msgs/es_pa.msg +#usr/lib/tcl8.6/msgs/es_pe.msg +#usr/lib/tcl8.6/msgs/es_pr.msg +#usr/lib/tcl8.6/msgs/es_py.msg +#usr/lib/tcl8.6/msgs/es_sv.msg +#usr/lib/tcl8.6/msgs/es_uy.msg +#usr/lib/tcl8.6/msgs/es_ve.msg +#usr/lib/tcl8.6/msgs/et.msg +#usr/lib/tcl8.6/msgs/eu.msg +#usr/lib/tcl8.6/msgs/eu_es.msg +#usr/lib/tcl8.6/msgs/fa.msg +#usr/lib/tcl8.6/msgs/fa_in.msg +#usr/lib/tcl8.6/msgs/fa_ir.msg +#usr/lib/tcl8.6/msgs/fi.msg +#usr/lib/tcl8.6/msgs/fo.msg +#usr/lib/tcl8.6/msgs/fo_fo.msg +#usr/lib/tcl8.6/msgs/fr.msg +#usr/lib/tcl8.6/msgs/fr_be.msg +#usr/lib/tcl8.6/msgs/fr_ca.msg +#usr/lib/tcl8.6/msgs/fr_ch.msg +#usr/lib/tcl8.6/msgs/ga.msg +#usr/lib/tcl8.6/msgs/ga_ie.msg +#usr/lib/tcl8.6/msgs/gl.msg +#usr/lib/tcl8.6/msgs/gl_es.msg +#usr/lib/tcl8.6/msgs/gv.msg +#usr/lib/tcl8.6/msgs/gv_gb.msg +#usr/lib/tcl8.6/msgs/he.msg +#usr/lib/tcl8.6/msgs/hi.msg +#usr/lib/tcl8.6/msgs/hi_in.msg +#usr/lib/tcl8.6/msgs/hr.msg +#usr/lib/tcl8.6/msgs/hu.msg +#usr/lib/tcl8.6/msgs/id.msg +#usr/lib/tcl8.6/msgs/id_id.msg +#usr/lib/tcl8.6/msgs/is.msg +#usr/lib/tcl8.6/msgs/it.msg +#usr/lib/tcl8.6/msgs/it_ch.msg +#usr/lib/tcl8.6/msgs/ja.msg +#usr/lib/tcl8.6/msgs/kl.msg +#usr/lib/tcl8.6/msgs/kl_gl.msg +#usr/lib/tcl8.6/msgs/ko.msg +#usr/lib/tcl8.6/msgs/ko_kr.msg +#usr/lib/tcl8.6/msgs/kok.msg +#usr/lib/tcl8.6/msgs/kok_in.msg +#usr/lib/tcl8.6/msgs/kw.msg +#usr/lib/tcl8.6/msgs/kw_gb.msg +#usr/lib/tcl8.6/msgs/lt.msg +#usr/lib/tcl8.6/msgs/lv.msg +#usr/lib/tcl8.6/msgs/mk.msg +#usr/lib/tcl8.6/msgs/mr.msg +#usr/lib/tcl8.6/msgs/mr_in.msg +#usr/lib/tcl8.6/msgs/ms.msg +#usr/lib/tcl8.6/msgs/ms_my.msg +#usr/lib/tcl8.6/msgs/mt.msg +#usr/lib/tcl8.6/msgs/nb.msg +#usr/lib/tcl8.6/msgs/nl.msg +#usr/lib/tcl8.6/msgs/nl_be.msg +#usr/lib/tcl8.6/msgs/nn.msg +#usr/lib/tcl8.6/msgs/pl.msg +#usr/lib/tcl8.6/msgs/pt.msg +#usr/lib/tcl8.6/msgs/pt_br.msg +#usr/lib/tcl8.6/msgs/ro.msg +#usr/lib/tcl8.6/msgs/ru.msg +#usr/lib/tcl8.6/msgs/ru_ua.msg +#usr/lib/tcl8.6/msgs/sh.msg +#usr/lib/tcl8.6/msgs/sk.msg +#usr/lib/tcl8.6/msgs/sl.msg +#usr/lib/tcl8.6/msgs/sq.msg +#usr/lib/tcl8.6/msgs/sr.msg +#usr/lib/tcl8.6/msgs/sv.msg +#usr/lib/tcl8.6/msgs/sw.msg +#usr/lib/tcl8.6/msgs/ta.msg +#usr/lib/tcl8.6/msgs/ta_in.msg +#usr/lib/tcl8.6/msgs/te.msg +#usr/lib/tcl8.6/msgs/te_in.msg +#usr/lib/tcl8.6/msgs/th.msg +#usr/lib/tcl8.6/msgs/tr.msg +#usr/lib/tcl8.6/msgs/uk.msg +#usr/lib/tcl8.6/msgs/vi.msg +#usr/lib/tcl8.6/msgs/zh.msg +#usr/lib/tcl8.6/msgs/zh_cn.msg +#usr/lib/tcl8.6/msgs/zh_hk.msg +#usr/lib/tcl8.6/msgs/zh_sg.msg +#usr/lib/tcl8.6/msgs/zh_tw.msg +#usr/lib/tcl8.6/opt0.4 +usr/lib/tcl8.6/opt0.4/optparse.tcl +usr/lib/tcl8.6/opt0.4/pkgIndex.tcl +usr/lib/tcl8.6/package.tcl +usr/lib/tcl8.6/parray.tcl +usr/lib/tcl8.6/safe.tcl +usr/lib/tcl8.6/tclAppInit.c +usr/lib/tcl8.6/tclIndex +usr/lib/tcl8.6/tm.tcl +usr/lib/tcl8.6/word.tcl +#usr/lib/tcl8/8.4 +usr/lib/tcl8/8.4/platform +usr/lib/tcl8/8.4/platform-1.0.14.tm +usr/lib/tcl8/8.4/platform/shell-1.1.4.tm +#usr/lib/tcl8/8.5 +usr/lib/tcl8/8.5/msgcat-1.6.0.tm +usr/lib/tcl8/8.5/tcltest-2.4.0.tm +#usr/lib/tcl8/8.6 +usr/lib/tcl8/8.6/http-2.8.9.tm +usr/lib/tcl8/8.6/tdbc +usr/lib/tcl8/8.6/tdbc/sqlite3-1.0.4.tm usr/lib/tclConfig.sh +usr/lib/tclooConfig.sh +#usr/lib/tdbc1.0.4 +usr/lib/tdbc1.0.4/libtdbc1.0.4.so +usr/lib/tdbc1.0.4/libtdbcstub1.0.4.a +usr/lib/tdbc1.0.4/pkgIndex.tcl +usr/lib/tdbc1.0.4/tdbc.tcl +usr/lib/tdbc1.0.4/tdbcConfig.sh +#usr/lib/tdbcmysql1.0.4 +usr/lib/tdbcmysql1.0.4/libtdbcmysql1.0.4.so +usr/lib/tdbcmysql1.0.4/pkgIndex.tcl +usr/lib/tdbcmysql1.0.4/tdbcmysql.tcl +#usr/lib/tdbcodbc1.0.4 +usr/lib/tdbcodbc1.0.4/libtdbcodbc1.0.4.so +usr/lib/tdbcodbc1.0.4/pkgIndex.tcl +usr/lib/tdbcodbc1.0.4/tdbcodbc.tcl +#usr/lib/tdbcpostgres1.0.4 +usr/lib/tdbcpostgres1.0.4/libtdbcpostgres1.0.4.so +usr/lib/tdbcpostgres1.0.4/pkgIndex.tcl +usr/lib/tdbcpostgres1.0.4/tdbcpostgres.tcl +#usr/lib/thread2.8.0 +usr/lib/thread2.8.0/libthread2.8.0.so +usr/lib/thread2.8.0/pkgIndex.tcl +usr/lib/thread2.8.0/ttrace.tcl #usr/man/man1/tclsh.1 #usr/man/man3/TCL_MEM_DEBUG.3 #usr/man/man3/Tcl_Access.3 @@ -124,7 +312,12 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_AppInit.3 #usr/man/man3/Tcl_AppendAllObjTypes.3 #usr/man/man3/Tcl_AppendElement.3 +#usr/man/man3/Tcl_AppendExportList.3 +#usr/man/man3/Tcl_AppendFormatToObj.3 +#usr/man/man3/Tcl_AppendLimitedToObj.3 +#usr/man/man3/Tcl_AppendObjToErrorInfo.3 #usr/man/man3/Tcl_AppendObjToObj.3 +#usr/man/man3/Tcl_AppendPrintfToObj.3 #usr/man/man3/Tcl_AppendResult.3 #usr/man/man3/Tcl_AppendResultVA.3 #usr/man/man3/Tcl_AppendStringsToObj.3 @@ -140,10 +333,13 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_AttemptRealloc.3 #usr/man/man3/Tcl_AttemptSetObjLength.3 #usr/man/man3/Tcl_BackgroundError.3 +#usr/man/man3/Tcl_BackgroundException.3 #usr/man/man3/Tcl_Backslash.3 #usr/man/man3/Tcl_BadChannelOption.3 #usr/man/man3/Tcl_CallWhenDeleted.3 +#usr/man/man3/Tcl_CancelEval.3 #usr/man/man3/Tcl_CancelIdleCall.3 +#usr/man/man3/Tcl_Canceled.3 #usr/man/man3/Tcl_ChannelBlockModeProc.3 #usr/man/man3/Tcl_ChannelBuffered.3 #usr/man/man3/Tcl_ChannelClose2Proc.3 @@ -158,10 +354,15 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_ChannelSeekProc.3 #usr/man/man3/Tcl_ChannelSetOptionProc.3 #usr/man/man3/Tcl_ChannelThreadActionProc.3 +#usr/man/man3/Tcl_ChannelTruncateProc.3 #usr/man/man3/Tcl_ChannelVersion.3 #usr/man/man3/Tcl_ChannelWatchProc.3 #usr/man/man3/Tcl_ChannelWideSeekProc.3 #usr/man/man3/Tcl_Chdir.3 +#usr/man/man3/Tcl_ClassGetMetadata.3 +#usr/man/man3/Tcl_ClassSetConstructor.3 +#usr/man/man3/Tcl_ClassSetDestructor.3 +#usr/man/man3/Tcl_ClassSetMetadata.3 #usr/man/man3/Tcl_ClearChannelHandlers.3 #usr/man/man3/Tcl_Close.3 #usr/man/man3/Tcl_CommandComplete.3 @@ -174,6 +375,7 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_ConvertCountedElement.3 #usr/man/man3/Tcl_ConvertElement.3 #usr/man/man3/Tcl_ConvertToType.3 +#usr/man/man3/Tcl_CopyObjectInstance.3 #usr/man/man3/Tcl_CreateAlias.3 #usr/man/man3/Tcl_CreateAliasObj.3 #usr/man/man3/Tcl_CreateChannel.3 @@ -181,12 +383,14 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_CreateCloseHandler.3 #usr/man/man3/Tcl_CreateCommand.3 #usr/man/man3/Tcl_CreateEncoding.3 +#usr/man/man3/Tcl_CreateEnsemble.3 #usr/man/man3/Tcl_CreateEventSource.3 #usr/man/man3/Tcl_CreateExitHandler.3 #usr/man/man3/Tcl_CreateFileHandler.3 #usr/man/man3/Tcl_CreateHashEntry.3 #usr/man/man3/Tcl_CreateInterp.3 #usr/man/man3/Tcl_CreateMathFunc.3 +#usr/man/man3/Tcl_CreateNamespace.3 #usr/man/man3/Tcl_CreateObjCommand.3 #usr/man/man3/Tcl_CreateObjTrace.3 #usr/man/man3/Tcl_CreateSlave.3 @@ -220,11 +424,22 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_DeleteHashEntry.3 #usr/man/man3/Tcl_DeleteHashTable.3 #usr/man/man3/Tcl_DeleteInterp.3 +#usr/man/man3/Tcl_DeleteNamespace.3 #usr/man/man3/Tcl_DeleteThreadExitHandler.3 #usr/man/man3/Tcl_DeleteTimerHandler.3 #usr/man/man3/Tcl_DeleteTrace.3 #usr/man/man3/Tcl_DetachChannel.3 #usr/man/man3/Tcl_DetachPids.3 +#usr/man/man3/Tcl_DictObjDone.3 +#usr/man/man3/Tcl_DictObjFirst.3 +#usr/man/man3/Tcl_DictObjGet.3 +#usr/man/man3/Tcl_DictObjNext.3 +#usr/man/man3/Tcl_DictObjPut.3 +#usr/man/man3/Tcl_DictObjPutKeyList.3 +#usr/man/man3/Tcl_DictObjRemove.3 +#usr/man/man3/Tcl_DictObjRemoveKeyList.3 +#usr/man/man3/Tcl_DictObjSize.3 +#usr/man/man3/Tcl_DiscardInterpState.3 #usr/man/man3/Tcl_DiscardResult.3 #usr/man/man3/Tcl_DoOneEvent.3 #usr/man/man3/Tcl_DoWhenIdle.3 @@ -244,6 +459,7 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_EventuallyFree.3 #usr/man/man3/Tcl_Exit.3 #usr/man/man3/Tcl_ExitThread.3 +#usr/man/man3/Tcl_Export.3 #usr/man/man3/Tcl_ExposeCommand.3 #usr/man/man3/Tcl_ExprBoolean.3 #usr/man/man3/Tcl_ExprBooleanObj.3 @@ -265,6 +481,7 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_FSDeleteFile.3 #usr/man/man3/Tcl_FSEqualPaths.3 #usr/man/man3/Tcl_FSEvalFile.3 +#usr/man/man3/Tcl_FSEvalFileEx.3 #usr/man/man3/Tcl_FSFileAttrStrings.3 #usr/man/man3/Tcl_FSFileAttrsGet.3 #usr/man/man3/Tcl_FSFileAttrsSet.3 @@ -293,27 +510,41 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_FSRenameFile.3 #usr/man/man3/Tcl_FSSplitPath.3 #usr/man/man3/Tcl_FSStat.3 +#usr/man/man3/Tcl_FSUnloadFile.3 #usr/man/man3/Tcl_FSUnregister.3 #usr/man/man3/Tcl_FSUtime.3 #usr/man/man3/Tcl_Finalize.3 #usr/man/man3/Tcl_FinalizeNotifier.3 #usr/man/man3/Tcl_FinalizeThread.3 +#usr/man/man3/Tcl_FindCommand.3 +#usr/man/man3/Tcl_FindEnsemble.3 #usr/man/man3/Tcl_FindExecutable.3 #usr/man/man3/Tcl_FindHashEntry.3 +#usr/man/man3/Tcl_FindNamespace.3 +#usr/man/man3/Tcl_FindSymbol.3 #usr/man/man3/Tcl_FirstHashEntry.3 #usr/man/man3/Tcl_Flush.3 +#usr/man/man3/Tcl_ForgetImport.3 +#usr/man/man3/Tcl_Format.3 #usr/man/man3/Tcl_Free.3 #usr/man/man3/Tcl_FreeEncoding.3 #usr/man/man3/Tcl_FreeParse.3 #usr/man/man3/Tcl_FreeResult.3 +#usr/man/man3/Tcl_GetAccessTimeFromStat.3 #usr/man/man3/Tcl_GetAlias.3 #usr/man/man3/Tcl_GetAliasObj.3 #usr/man/man3/Tcl_GetAssocData.3 +#usr/man/man3/Tcl_GetBignumFromObj.3 +#usr/man/man3/Tcl_GetBlockSizeFromStat.3 +#usr/man/man3/Tcl_GetBlocksFromStat.3 #usr/man/man3/Tcl_GetBoolean.3 #usr/man/man3/Tcl_GetBooleanFromObj.3 #usr/man/man3/Tcl_GetByteArrayFromObj.3 +#usr/man/man3/Tcl_GetChangeTimeFromStat.3 #usr/man/man3/Tcl_GetChannel.3 #usr/man/man3/Tcl_GetChannelBufferSize.3 +#usr/man/man3/Tcl_GetChannelError.3 +#usr/man/man3/Tcl_GetChannelErrorInterp.3 #usr/man/man3/Tcl_GetChannelHandle.3 #usr/man/man3/Tcl_GetChannelInstanceData.3 #usr/man/man3/Tcl_GetChannelMode.3 @@ -324,20 +555,37 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_GetChannelThread.3 #usr/man/man3/Tcl_GetChannelType.3 #usr/man/man3/Tcl_GetCharLength.3 +#usr/man/man3/Tcl_GetClassAsObject.3 #usr/man/man3/Tcl_GetCommandFromObj.3 #usr/man/man3/Tcl_GetCommandFullName.3 #usr/man/man3/Tcl_GetCommandInfo.3 #usr/man/man3/Tcl_GetCommandInfoFromToken.3 #usr/man/man3/Tcl_GetCommandName.3 +#usr/man/man3/Tcl_GetCurrentNamespace.3 #usr/man/man3/Tcl_GetCurrentThread.3 #usr/man/man3/Tcl_GetCwd.3 #usr/man/man3/Tcl_GetDefaultEncodingDir.3 +#usr/man/man3/Tcl_GetDeviceTypeFromStat.3 #usr/man/man3/Tcl_GetDouble.3 #usr/man/man3/Tcl_GetDoubleFromObj.3 #usr/man/man3/Tcl_GetEncoding.3 +#usr/man/man3/Tcl_GetEncodingFromObj.3 #usr/man/man3/Tcl_GetEncodingName.3 +#usr/man/man3/Tcl_GetEncodingNameFromEnvironment.3 #usr/man/man3/Tcl_GetEncodingNames.3 +#usr/man/man3/Tcl_GetEncodingSearchPath.3 +#usr/man/man3/Tcl_GetEnsembleFlags.3 +#usr/man/man3/Tcl_GetEnsembleMappingDict.3 +#usr/man/man3/Tcl_GetEnsembleNamespace.3 +#usr/man/man3/Tcl_GetEnsembleParameterList.3 +#usr/man/man3/Tcl_GetEnsembleSubcommandList.3 +#usr/man/man3/Tcl_GetEnsembleUnknownHandler.3 #usr/man/man3/Tcl_GetErrno.3 +#usr/man/man3/Tcl_GetErrorLine.3 +#usr/man/man3/Tcl_GetFSDeviceFromStat.3 +#usr/man/man3/Tcl_GetFSInodeFromStat.3 +#usr/man/man3/Tcl_GetGlobalNamespace.3 +#usr/man/man3/Tcl_GetGroupIdFromStat.3 #usr/man/man3/Tcl_GetHashKey.3 #usr/man/man3/Tcl_GetHashValue.3 #usr/man/man3/Tcl_GetHostName.3 @@ -346,20 +594,31 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_GetInt.3 #usr/man/man3/Tcl_GetIntFromObj.3 #usr/man/man3/Tcl_GetInterpPath.3 +#usr/man/man3/Tcl_GetLinkCountFromStat.3 #usr/man/man3/Tcl_GetLongFromObj.3 #usr/man/man3/Tcl_GetMaster.3 #usr/man/man3/Tcl_GetMathFuncInfo.3 +#usr/man/man3/Tcl_GetModeFromStat.3 +#usr/man/man3/Tcl_GetModificationTimeFromStat.3 #usr/man/man3/Tcl_GetNameOfExecutable.3 -#usr/man/man3/Tcl_GetOSTypeFromObj.3 +#usr/man/man3/Tcl_GetNamespaceUnknownHandler.3 #usr/man/man3/Tcl_GetObjResult.3 #usr/man/man3/Tcl_GetObjType.3 +#usr/man/man3/Tcl_GetObjectAsClass.3 +#usr/man/man3/Tcl_GetObjectCommand.3 +#usr/man/man3/Tcl_GetObjectFromObj.3 +#usr/man/man3/Tcl_GetObjectName.3 +#usr/man/man3/Tcl_GetObjectNamespace.3 #usr/man/man3/Tcl_GetOpenFile.3 #usr/man/man3/Tcl_GetPathType.3 #usr/man/man3/Tcl_GetRange.3 #usr/man/man3/Tcl_GetRegExpFromObj.3 +#usr/man/man3/Tcl_GetReturnOptions.3 #usr/man/man3/Tcl_GetServiceMode.3 +#usr/man/man3/Tcl_GetSizeFromStat.3 #usr/man/man3/Tcl_GetSlave.3 #usr/man/man3/Tcl_GetStackedChannel.3 +#usr/man/man3/Tcl_GetStartupScript.3 #usr/man/man3/Tcl_GetStdChannel.3 #usr/man/man3/Tcl_GetString.3 #usr/man/man3/Tcl_GetStringFromObj.3 @@ -370,6 +629,7 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_GetUniChar.3 #usr/man/man3/Tcl_GetUnicode.3 #usr/man/man3/Tcl_GetUnicodeFromObj.3 +#usr/man/man3/Tcl_GetUserIdFromStat.3 #usr/man/man3/Tcl_GetVar.3 #usr/man/man3/Tcl_GetVar2.3 #usr/man/man3/Tcl_GetVar2Ex.3 @@ -381,6 +641,7 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_GlobalEvalObj.3 #usr/man/man3/Tcl_HashStats.3 #usr/man/man3/Tcl_HideCommand.3 +#usr/man/man3/Tcl_Import.3 #usr/man/man3/Tcl_IncrRefCount.3 #usr/man/man3/Tcl_Init.3 #usr/man/man3/Tcl_InitCustomHashTable.3 @@ -392,16 +653,33 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_InputBlocked.3 #usr/man/man3/Tcl_InputBuffered.3 #usr/man/man3/Tcl_Interp.3 +#usr/man/man3/Tcl_InterpActive.3 #usr/man/man3/Tcl_InterpDeleted.3 #usr/man/man3/Tcl_InvalidateStringRep.3 #usr/man/man3/Tcl_IsChannelExisting.3 #usr/man/man3/Tcl_IsChannelRegistered.3 #usr/man/man3/Tcl_IsChannelShared.3 +#usr/man/man3/Tcl_IsEnsemble.3 #usr/man/man3/Tcl_IsSafe.3 #usr/man/man3/Tcl_IsShared.3 #usr/man/man3/Tcl_IsStandardChannel.3 #usr/man/man3/Tcl_JoinPath.3 #usr/man/man3/Tcl_JoinThread.3 +#usr/man/man3/Tcl_LimitAddHandler.3 +#usr/man/man3/Tcl_LimitCheck.3 +#usr/man/man3/Tcl_LimitExceeded.3 +#usr/man/man3/Tcl_LimitGetCommands.3 +#usr/man/man3/Tcl_LimitGetGranularity.3 +#usr/man/man3/Tcl_LimitGetTime.3 +#usr/man/man3/Tcl_LimitReady.3 +#usr/man/man3/Tcl_LimitRemoveHandler.3 +#usr/man/man3/Tcl_LimitSetCommands.3 +#usr/man/man3/Tcl_LimitSetGranularity.3 +#usr/man/man3/Tcl_LimitSetTime.3 +#usr/man/man3/Tcl_LimitTypeEnabled.3 +#usr/man/man3/Tcl_LimitTypeExceeded.3 +#usr/man/man3/Tcl_LimitTypeReset.3 +#usr/man/man3/Tcl_LimitTypeSet.3 #usr/man/man3/Tcl_LinkVar.3 #usr/man/man3/Tcl_ListMathFuncs.3 #usr/man/man3/Tcl_ListObjAppendElement.3 @@ -410,35 +688,60 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_ListObjIndex.3 #usr/man/man3/Tcl_ListObjLength.3 #usr/man/man3/Tcl_ListObjReplace.3 +#usr/man/man3/Tcl_LoadFile.3 #usr/man/man3/Tcl_LogCommandInfo.3 -#usr/man/man3/Tcl_MacConvertTextResource.3 -#usr/man/man3/Tcl_MacEvalResource.3 -#usr/man/man3/Tcl_MacFindResource.3 -#usr/man/man3/Tcl_MacSetEventProc.3 #usr/man/man3/Tcl_Main.3 #usr/man/man3/Tcl_MakeFileChannel.3 #usr/man/man3/Tcl_MakeSafe.3 #usr/man/man3/Tcl_MakeTcpClientChannel.3 #usr/man/man3/Tcl_Merge.3 +#usr/man/man3/Tcl_MethodDeclarerClass.3 +#usr/man/man3/Tcl_MethodDeclarerObject.3 +#usr/man/man3/Tcl_MethodIsPublic.3 +#usr/man/man3/Tcl_MethodIsType.3 +#usr/man/man3/Tcl_MethodName.3 #usr/man/man3/Tcl_MutexFinalize.3 #usr/man/man3/Tcl_MutexLock.3 #usr/man/man3/Tcl_MutexUnlock.3 +#usr/man/man3/Tcl_NRAddCallback.3 +#usr/man/man3/Tcl_NRCallObjProc.3 +#usr/man/man3/Tcl_NRCmdSwap.3 +#usr/man/man3/Tcl_NRCreateCommand.3 +#usr/man/man3/Tcl_NREvalObj.3 +#usr/man/man3/Tcl_NREvalObjv.3 +#usr/man/man3/Tcl_NRExprObj.3 +#usr/man/man3/Tcl_NewBignumObj.3 #usr/man/man3/Tcl_NewBooleanObj.3 #usr/man/man3/Tcl_NewByteArrayObj.3 +#usr/man/man3/Tcl_NewDictObj.3 #usr/man/man3/Tcl_NewDoubleObj.3 +#usr/man/man3/Tcl_NewInstanceMethod.3 #usr/man/man3/Tcl_NewIntObj.3 #usr/man/man3/Tcl_NewListObj.3 #usr/man/man3/Tcl_NewLongObj.3 -#usr/man/man3/Tcl_NewOSTypeObj.3 +#usr/man/man3/Tcl_NewMethod.3 #usr/man/man3/Tcl_NewObj.3 +#usr/man/man3/Tcl_NewObjectInstance.3 #usr/man/man3/Tcl_NewStringObj.3 #usr/man/man3/Tcl_NewUnicodeObj.3 #usr/man/man3/Tcl_NewWideIntObj.3 #usr/man/man3/Tcl_NextHashEntry.3 #usr/man/man3/Tcl_NotifyChannel.3 #usr/man/man3/Tcl_NumUtfChars.3 +#usr/man/man3/Tcl_OOInitStubs.3 #usr/man/man3/Tcl_ObjGetVar2.3 +#usr/man/man3/Tcl_ObjPrintf.3 #usr/man/man3/Tcl_ObjSetVar2.3 +#usr/man/man3/Tcl_ObjectContextInvokeNext.3 +#usr/man/man3/Tcl_ObjectContextIsFiltering.3 +#usr/man/man3/Tcl_ObjectContextMethod.3 +#usr/man/man3/Tcl_ObjectContextObject.3 +#usr/man/man3/Tcl_ObjectContextSkippedArgs.3 +#usr/man/man3/Tcl_ObjectDeleted.3 +#usr/man/man3/Tcl_ObjectGetMetadata.3 +#usr/man/man3/Tcl_ObjectGetMethodNameMapper.3 +#usr/man/man3/Tcl_ObjectSetMetadata.3 +#usr/man/man3/Tcl_ObjectSetMethodNameMapper.3 #usr/man/man3/Tcl_OpenCommandChannel.3 #usr/man/man3/Tcl_OpenFileChannel.3 #usr/man/man3/Tcl_OpenTcpClient.3 @@ -446,6 +749,7 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_OutputBuffered.3 #usr/man/man3/Tcl_Panic.3 #usr/man/man3/Tcl_PanicVA.3 +#usr/man/man3/Tcl_ParseArgsObjv.3 #usr/man/man3/Tcl_ParseBraces.3 #usr/man/man3/Tcl_ParseCommand.3 #usr/man/man3/Tcl_ParseExpr.3 @@ -458,10 +762,12 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_PkgProvideEx.3 #usr/man/man3/Tcl_PkgRequire.3 #usr/man/man3/Tcl_PkgRequireEx.3 +#usr/man/man3/Tcl_PkgRequireProc.3 #usr/man/man3/Tcl_PosixError.3 #usr/man/man3/Tcl_Preserve.3 #usr/man/man3/Tcl_PrintDouble.3 #usr/man/man3/Tcl_PutEnv.3 +#usr/man/man3/Tcl_QueryTimeProc.3 #usr/man/man3/Tcl_QueueEvent.3 #usr/man/man3/Tcl_Read.3 #usr/man/man3/Tcl_ReadChars.3 @@ -478,46 +784,65 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_RegExpMatchObj.3 #usr/man/man3/Tcl_RegExpRange.3 #usr/man/man3/Tcl_RegisterChannel.3 +#usr/man/man3/Tcl_RegisterConfig.3 #usr/man/man3/Tcl_RegisterObjType.3 #usr/man/man3/Tcl_Release.3 #usr/man/man3/Tcl_ResetResult.3 +#usr/man/man3/Tcl_RestoreInterpState.3 #usr/man/man3/Tcl_RestoreResult.3 +#usr/man/man3/Tcl_SaveInterpState.3 #usr/man/man3/Tcl_SaveResult.3 #usr/man/man3/Tcl_ScanCountedElement.3 #usr/man/man3/Tcl_ScanElement.3 #usr/man/man3/Tcl_Seek.3 #usr/man/man3/Tcl_ServiceAll.3 #usr/man/man3/Tcl_ServiceEvent.3 +#usr/man/man3/Tcl_ServiceModeHook.3 #usr/man/man3/Tcl_SetAssocData.3 +#usr/man/man3/Tcl_SetBignumObj.3 #usr/man/man3/Tcl_SetBooleanObj.3 #usr/man/man3/Tcl_SetByteArrayLength.3 #usr/man/man3/Tcl_SetByteArrayObj.3 #usr/man/man3/Tcl_SetChannelBufferSize.3 +#usr/man/man3/Tcl_SetChannelError.3 +#usr/man/man3/Tcl_SetChannelErrorInterp.3 #usr/man/man3/Tcl_SetChannelOption.3 #usr/man/man3/Tcl_SetCommandInfo.3 #usr/man/man3/Tcl_SetCommandInfoFromToken.3 #usr/man/man3/Tcl_SetDefaultEncodingDir.3 #usr/man/man3/Tcl_SetDoubleObj.3 +#usr/man/man3/Tcl_SetEncodingSearchPath.3 +#usr/man/man3/Tcl_SetEnsembleFlags.3 +#usr/man/man3/Tcl_SetEnsembleMappingDict.3 +#usr/man/man3/Tcl_SetEnsembleParameterList.3 +#usr/man/man3/Tcl_SetEnsembleSubcommandList.3 +#usr/man/man3/Tcl_SetEnsembleUnknownHandler.3 #usr/man/man3/Tcl_SetErrno.3 #usr/man/man3/Tcl_SetErrorCode.3 #usr/man/man3/Tcl_SetErrorCodeVA.3 +#usr/man/man3/Tcl_SetErrorLine.3 +#usr/man/man3/Tcl_SetExitProc.3 #usr/man/man3/Tcl_SetHashValue.3 #usr/man/man3/Tcl_SetIntObj.3 #usr/man/man3/Tcl_SetListObj.3 #usr/man/man3/Tcl_SetLongObj.3 #usr/man/man3/Tcl_SetMainLoop.3 #usr/man/man3/Tcl_SetMaxBlockTime.3 -#usr/man/man3/Tcl_SetOSTypeObj.3 +#usr/man/man3/Tcl_SetNamespaceUnknownHandler.3 +#usr/man/man3/Tcl_SetNotifier.3 #usr/man/man3/Tcl_SetObjErrorCode.3 #usr/man/man3/Tcl_SetObjLength.3 #usr/man/man3/Tcl_SetObjResult.3 #usr/man/man3/Tcl_SetPanicProc.3 #usr/man/man3/Tcl_SetRecursionLimit.3 #usr/man/man3/Tcl_SetResult.3 +#usr/man/man3/Tcl_SetReturnOptions.3 #usr/man/man3/Tcl_SetServiceMode.3 +#usr/man/man3/Tcl_SetStartupScript.3 #usr/man/man3/Tcl_SetStdChannel.3 #usr/man/man3/Tcl_SetStringObj.3 #usr/man/man3/Tcl_SetSystemEncoding.3 +#usr/man/man3/Tcl_SetTimeProc.3 #usr/man/man3/Tcl_SetTimer.3 #usr/man/man3/Tcl_SetUnicodeObj.3 #usr/man/man3/Tcl_SetVar.3 @@ -538,13 +863,16 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_StringCaseMatch.3 #usr/man/man3/Tcl_StringMatch.3 #usr/man/man3/Tcl_SubstObj.3 +#usr/man/man3/Tcl_TakeBignumFromObj.3 #usr/man/man3/Tcl_Tell.3 #usr/man/man3/Tcl_ThreadAlert.3 #usr/man/man3/Tcl_ThreadQueueEvent.3 #usr/man/man3/Tcl_TraceCommand.3 #usr/man/man3/Tcl_TraceVar.3 #usr/man/man3/Tcl_TraceVar2.3 +#usr/man/man3/Tcl_TransferResult.3 #usr/man/man3/Tcl_TranslateFileName.3 +#usr/man/man3/Tcl_TruncateChannel.3 #usr/man/man3/Tcl_Ungets.3 #usr/man/man3/Tcl_UniChar.3 #usr/man/man3/Tcl_UniCharAtIndex.3 @@ -584,6 +912,8 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_UtfCharComplete.3 #usr/man/man3/Tcl_UtfFindFirst.3 #usr/man/man3/Tcl_UtfFindLast.3 +#usr/man/man3/Tcl_UtfNcasecmp.3 +#usr/man/man3/Tcl_UtfNcmp.3 #usr/man/man3/Tcl_UtfNext.3 #usr/man/man3/Tcl_UtfPrev.3 #usr/man/man3/Tcl_UtfToExternal.3 @@ -607,24 +937,36 @@ usr/lib/tclConfig.sh #usr/man/man3/Tcl_WriteObj.3 #usr/man/man3/Tcl_WriteRaw.3 #usr/man/man3/Tcl_WrongNumArgs.3 +#usr/man/man3/Tcl_ZlibAdler32.3 +#usr/man/man3/Tcl_ZlibCRC32.3 +#usr/man/man3/Tcl_ZlibDeflate.3 +#usr/man/man3/Tcl_ZlibInflate.3 +#usr/man/man3/Tcl_ZlibStreamChecksum.3 +#usr/man/man3/Tcl_ZlibStreamClose.3 +#usr/man/man3/Tcl_ZlibStreamEof.3 +#usr/man/man3/Tcl_ZlibStreamGet.3 +#usr/man/man3/Tcl_ZlibStreamGetCommandName.3 +#usr/man/man3/Tcl_ZlibStreamInit.3 +#usr/man/man3/Tcl_ZlibStreamPut.3 #usr/man/man3/attemptckalloc.3 #usr/man/man3/attemptckrealloc.3 #usr/man/man3/ckalloc.3 #usr/man/man3/ckfree.3 #usr/man/man3/ckrealloc.3 -#usr/man/man3/panic.3 -#usr/man/man3/panicVA.3 #usr/man/mann -#usr/man/mann/SafeBase.n #usr/man/mann/Tcl.n #usr/man/mann/after.n #usr/man/mann/append.n +#usr/man/mann/apply.n +#usr/man/mann/argc.n +#usr/man/mann/argv.n +#usr/man/mann/argv0.n #usr/man/mann/array.n #usr/man/mann/auto_execok.n #usr/man/mann/auto_import.n #usr/man/mann/auto_load.n #usr/man/mann/auto_mkindex.n -#usr/man/mann/auto_mkindex_old.n +#usr/man/mann/auto_path.n #usr/man/mann/auto_qualify.n #usr/man/mann/auto_reset.n #usr/man/mann/bgerror.n @@ -633,14 +975,20 @@ usr/lib/tclConfig.sh #usr/man/mann/case.n #usr/man/mann/catch.n #usr/man/mann/cd.n +#usr/man/mann/chan.n #usr/man/mann/clock.n #usr/man/mann/close.n #usr/man/mann/concat.n #usr/man/mann/continue.n +#usr/man/mann/coroutine.n #usr/man/mann/dde.n +#usr/man/mann/dict.n #usr/man/mann/encoding.n +#usr/man/mann/env.n #usr/man/mann/eof.n #usr/man/mann/error.n +#usr/man/mann/errorCode.n +#usr/man/mann/errorInfo.n #usr/man/mann/eval.n #usr/man/mann/exec.n #usr/man/mann/exit.n @@ -666,38 +1014,56 @@ usr/lib/tclConfig.sh #usr/man/mann/interp.n #usr/man/mann/join.n #usr/man/mann/lappend.n +#usr/man/mann/lassign.n #usr/man/mann/lindex.n #usr/man/mann/linsert.n #usr/man/mann/list.n #usr/man/mann/llength.n +#usr/man/mann/lmap.n #usr/man/mann/load.n #usr/man/mann/lrange.n +#usr/man/mann/lrepeat.n #usr/man/mann/lreplace.n +#usr/man/mann/lreverse.n #usr/man/mann/lsearch.n #usr/man/mann/lset.n #usr/man/mann/lsort.n +#usr/man/mann/mathfunc.n +#usr/man/mann/mathop.n #usr/man/mann/memory.n #usr/man/mann/msgcat.n +#usr/man/mann/my.n #usr/man/mann/namespace.n +#usr/man/mann/next.n +#usr/man/mann/nextto.n +#usr/man/mann/oo_class.n +#usr/man/mann/oo_copy.n +#usr/man/mann/oo_define.n +#usr/man/mann/oo_objdefine.n +#usr/man/mann/oo_object.n #usr/man/mann/open.n #usr/man/mann/package.n #usr/man/mann/parray.n #usr/man/mann/pid.n -#usr/man/mann/pkg::create.n +#usr/man/mann/pkg_create.n #usr/man/mann/pkg_mkIndex.n +#usr/man/mann/platform.n +#usr/man/mann/platform_shell.n #usr/man/mann/proc.n #usr/man/mann/puts.n #usr/man/mann/pwd.n #usr/man/mann/re_syntax.n #usr/man/mann/read.n +#usr/man/mann/refchan.n #usr/man/mann/regexp.n #usr/man/mann/registry.n #usr/man/mann/regsub.n #usr/man/mann/rename.n -#usr/man/mann/resource.n #usr/man/mann/return.n +#usr/man/mann/safe.n #usr/man/mann/scan.n #usr/man/mann/seek.n +#usr/man/mann/self.n #usr/man/mann/set.n #usr/man/mann/socket.n #usr/man/mann/source.n @@ -705,18 +1071,36 @@ usr/lib/tclConfig.sh #usr/man/mann/string.n #usr/man/mann/subst.n #usr/man/mann/switch.n +#usr/man/mann/tailcall.n #usr/man/mann/tcl_endOfWord.n #usr/man/mann/tcl_findLibrary.n +#usr/man/mann/tcl_interactive.n +#usr/man/mann/tcl_library.n +#usr/man/mann/tcl_nonwordchars.n +#usr/man/mann/tcl_patchLevel.n +#usr/man/mann/tcl_pkgPath.n +#usr/man/mann/tcl_platform.n +#usr/man/mann/tcl_precision.n +#usr/man/mann/tcl_prefix.n +#usr/man/mann/tcl_rcFileName.n #usr/man/mann/tcl_startOfNextWord.n #usr/man/mann/tcl_startOfPreviousWord.n +#usr/man/mann/tcl_traceCompile.n +#usr/man/mann/tcl_traceExec.n +#usr/man/mann/tcl_version.n #usr/man/mann/tcl_wordBreakAfter.n #usr/man/mann/tcl_wordBreakBefore.n +#usr/man/mann/tcl_wordchars.n #usr/man/mann/tcltest.n -#usr/man/mann/tclvars.n #usr/man/mann/tell.n +#usr/man/mann/throw.n #usr/man/mann/time.n +#usr/man/mann/tm.n #usr/man/mann/trace.n +#usr/man/mann/transchan.n +#usr/man/mann/try.n #usr/man/mann/unknown.n +#usr/man/mann/unload.n #usr/man/mann/unset.n #usr/man/mann/update.n #usr/man/mann/uplevel.n @@ -724,3 +1108,39 @@ usr/lib/tclConfig.sh #usr/man/mann/variable.n #usr/man/mann/vwait.n #usr/man/mann/while.n +#usr/man/mann/yield.n +#usr/man/mann/yieldto.n +#usr/man/mann/zlib.n +#usr/share/man/man3/Tdbc_Init.3 +#usr/share/man/mann +#usr/share/man/mann/body.n +#usr/share/man/mann/class.n +#usr/share/man/mann/code.n +#usr/share/man/mann/configbody.n +#usr/share/man/mann/delete.n +#usr/share/man/mann/ensemble.n +#usr/share/man/mann/find.n +#usr/share/man/mann/is.n +#usr/share/man/mann/itcl.n +#usr/share/man/mann/itclcomponent.n +#usr/share/man/mann/itcldelegate.n +#usr/share/man/mann/itclextendedclass.n +#usr/share/man/mann/itcloption.n +#usr/share/man/mann/itclvars.n +#usr/share/man/mann/itclwidget.n +#usr/share/man/mann/local.n +#usr/share/man/mann/scope.n +#usr/share/man/mann/sqlite3.n +#usr/share/man/mann/tdbc.n +#usr/share/man/mann/tdbc_connection.n +#usr/share/man/mann/tdbc_mapSqlState.n +#usr/share/man/mann/tdbc_mysql.n +#usr/share/man/mann/tdbc_odbc.n +#usr/share/man/mann/tdbc_resultset.n +#usr/share/man/mann/tdbc_sqlite3.n +#usr/share/man/mann/tdbc_statement.n +#usr/share/man/mann/tdbc_tokenize.n +#usr/share/man/mann/thread.n +#usr/share/man/mann/tpool.n +#usr/share/man/mann/tsv.n +#usr/share/man/mann/ttrace.n diff --git a/lfs/tcl b/lfs/tcl index e863729..06e9e08 100644 --- a/lfs/tcl +++ b/lfs/tcl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 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 = 8.4.13 +VER = 8.6.6 THISAPP = tcl$(VER) DL_FILE = $(THISAPP)-src.tar.gz @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c6b655ad5db095ee73227113220c0523 +$(DL_FILE)_MD5 = 5193aea8107839a79df8ac709552ecb7 install : $(TARGET) @@ -84,9 +84,9 @@ endif cd $(DIR_APP)/unix && make install ifneq "$(ROOT)" "" cd $(DIR_APP)/unix && make install-private-headers - ln -sf tclsh8.4 /tools/bin/tclsh + ln -sf tclsh8.6 /tools/bin/tclsh else - ln -sf tclsh8.4 /usr/bin/tclsh + ln -sf tclsh8.6 /usr/bin/tclsh endif @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e26a93322da5dc6d0c1537c0122b24a6dd63119d
by git＠ipfire.org 26 Sep '16

26 Sep '16

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 e26a93322da5dc6d0c1537c0122b24a6dd63119d (commit) via 59bddc7989e44800b7a855e88e28d6a6eb69e9b1 (commit) from feba68e4af48630d0c5dcd16bd799a0e02db2b36 (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 e26a93322da5dc6d0c1537c0122b24a6dd63119d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 26 21:03:33 2016 +0100 core106: Add recently updated packages, etc. This update removes dnsmasq and replaces it with unbound. Also many packages are updated and shipped. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 59bddc7989e44800b7a855e88e28d6a6eb69e9b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 26 20:24:21 2016 +0100 Start Core Update 106 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{105 => 106}/exclude | 0 .../{oldcore/44 => core/106}/filelists/attr | 0 .../{oldcore/103 => core/106}/filelists/diffutils | 0 config/rootfiles/core/106/filelists/ed | 1 + .../{oldcore/90 => core/106}/filelists/expat | 0 .../{oldcore/94 => core/106}/filelists/file | 0 config/rootfiles/core/106/filelists/files | 17 +++++++++++ config/rootfiles/core/106/filelists/flex | 1 + .../{oldcore/66 => core/106}/filelists/gawk | 0 .../{oldcore/66 => core/106}/filelists/gettext | 0 .../{oldcore/89 => core/106}/filelists/gnupg | 0 .../core/{105 => 106}/filelists/i586/openssl-sse2 | 0 .../106}/filelists/i586/strongswan-padlock | 0 .../{oldcore/94 => core/106}/filelists/iproute2 | 0 .../{oldcore/95 => core/106}/filelists/ipset | 0 .../94 => core/106}/filelists/libgpg-error | 0 .../{oldcore/90 => core/106}/filelists/libjpeg | 0 config/rootfiles/core/106/filelists/libjpeg-compat | 1 + .../{oldcore/66 => core/106}/filelists/libmnl | 0 .../106}/filelists/libnetfilter_conntrack | 0 .../{oldcore/87 => core/106}/filelists/misc-progs | 0 .../rootfiles/core/{105 => 106}/filelists/openssl | 0 config/rootfiles/core/106/filelists/python-daemon | 1 + .../rootfiles/core/106/filelists/python-docutils | 1 + config/rootfiles/core/106/filelists/python-inotify | 1 + .../rootfiles/core/106/filelists/python-ipaddress | 1 + .../89 => core/106}/filelists/smartmontools | 0 .../{oldcore/94 => core/106}/filelists/squid | 0 .../{oldcore/96 => core/106}/filelists/strongswan | 0 config/rootfiles/core/106/filelists/unbound | 1 + .../77 => core/106}/filelists/usb_modeswitch | 0 .../77 => core/106}/filelists/usb_modeswitch_data | 0 config/rootfiles/core/{105 => 106}/meta | 0 .../rootfiles/{oldcore/103 => core/106}/update.sh | 35 ++++++++++++++-------- config/rootfiles/oldcore/{104 => 105}/exclude | 0 .../{core => oldcore}/105/filelists/files | 0 .../{99 => 105}/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/105/filelists/libgcrypt | 0 .../oldcore/{99 => 105}/filelists/openssl | 0 config/rootfiles/oldcore/{99 => 105}/meta | 0 config/rootfiles/{core => oldcore}/105/update.sh | 0 make.sh | 2 +- 42 files changed, 48 insertions(+), 14 deletions(-) rename config/rootfiles/core/{105 => 106}/exclude (100%) copy config/rootfiles/{oldcore/44 => core/106}/filelists/attr (100%) copy config/rootfiles/{oldcore/103 => core/106}/filelists/diffutils (100%) create mode 120000 config/rootfiles/core/106/filelists/ed copy config/rootfiles/{oldcore/90 => core/106}/filelists/expat (100%) copy config/rootfiles/{oldcore/94 => core/106}/filelists/file (100%) create mode 100644 config/rootfiles/core/106/filelists/files create mode 120000 config/rootfiles/core/106/filelists/flex copy config/rootfiles/{oldcore/66 => core/106}/filelists/gawk (100%) copy config/rootfiles/{oldcore/66 => core/106}/filelists/gettext (100%) copy config/rootfiles/{oldcore/89 => core/106}/filelists/gnupg (100%) rename config/rootfiles/core/{105 => 106}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/96 => core/106}/filelists/i586/strongswan-padlock (100%) copy config/rootfiles/{oldcore/94 => core/106}/filelists/iproute2 (100%) copy config/rootfiles/{oldcore/95 => core/106}/filelists/ipset (100%) copy config/rootfiles/{oldcore/94 => core/106}/filelists/libgpg-error (100%) copy config/rootfiles/{oldcore/90 => core/106}/filelists/libjpeg (100%) create mode 120000 config/rootfiles/core/106/filelists/libjpeg-compat copy config/rootfiles/{oldcore/66 => core/106}/filelists/libmnl (100%) copy config/rootfiles/{oldcore/92 => core/106}/filelists/libnetfilter_conntrack (100%) copy config/rootfiles/{oldcore/87 => core/106}/filelists/misc-progs (100%) rename config/rootfiles/core/{105 => 106}/filelists/openssl (100%) create mode 120000 config/rootfiles/core/106/filelists/python-daemon create mode 120000 config/rootfiles/core/106/filelists/python-docutils create mode 120000 config/rootfiles/core/106/filelists/python-inotify create mode 120000 config/rootfiles/core/106/filelists/python-ipaddress copy config/rootfiles/{oldcore/89 => core/106}/filelists/smartmontools (100%) copy config/rootfiles/{oldcore/94 => core/106}/filelists/squid (100%) copy config/rootfiles/{oldcore/96 => core/106}/filelists/strongswan (100%) create mode 120000 config/rootfiles/core/106/filelists/unbound copy config/rootfiles/{oldcore/77 => core/106}/filelists/usb_modeswitch (100%) copy config/rootfiles/{oldcore/77 => core/106}/filelists/usb_modeswitch_data (100%) rename config/rootfiles/core/{105 => 106}/meta (100%) copy config/rootfiles/{oldcore/103 => core/106}/update.sh (79%) copy config/rootfiles/oldcore/{104 => 105}/exclude (100%) rename config/rootfiles/{core => oldcore}/105/filelists/files (100%) copy config/rootfiles/oldcore/{99 => 105}/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/105/filelists/libgcrypt (100%) copy config/rootfiles/oldcore/{99 => 105}/filelists/openssl (100%) copy config/rootfiles/oldcore/{99 => 105}/meta (100%) rename config/rootfiles/{core => oldcore}/105/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/105/exclude b/config/rootfiles/core/105/exclude deleted file mode 100644 index 7ddeae0..0000000 --- a/config/rootfiles/core/105/exclude +++ /dev/null @@ -1,28 +0,0 @@ -boot/config.txt -boot/grub/grub.cfg -boot/grub/grubenv -etc/alternatives -etc/collectd.custom -etc/default/grub -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/snort/snort.conf -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/dma -var/ipfire/time -var/ipfire/ovpn -var/lib/alternatives -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/105/filelists/files b/config/rootfiles/core/105/filelists/files deleted file mode 100644 index 409e5fe..0000000 --- a/config/rootfiles/core/105/filelists/files +++ /dev/null @@ -1,2 +0,0 @@ -etc/system-release -etc/issue diff --git a/config/rootfiles/core/105/filelists/i586/openssl-sse2 b/config/rootfiles/core/105/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/105/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/105/filelists/libgcrypt b/config/rootfiles/core/105/filelists/libgcrypt deleted file mode 120000 index 2df12a2..0000000 --- a/config/rootfiles/core/105/filelists/libgcrypt +++ /dev/null @@ -1 +0,0 @@ -../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/105/filelists/openssl b/config/rootfiles/core/105/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/105/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/105/meta b/config/rootfiles/core/105/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/105/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/105/update.sh b/config/rootfiles/core/105/update.sh deleted file mode 100644 index 3e9f601..0000000 --- a/config/rootfiles/core/105/update.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -core=105 - -function exit_with_error() { - # Set last succesfull installed core. - echo $(($core-1)) > /opt/pakfire/db/core/mine - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: $1" - exit $2 -} - -# Remove old core updates from pakfire cache to save space... -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - - -# Stop services - -# Extract files -extract_files - -# update linker config -ldconfig - -# Update Language cache -#/usr/local/bin/update-lang-cache - -# Start services - -# This update need a reboot... -touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile - -# Update grub config to display new core version -if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig -o /boot/grub/grub.cfg -fi -sync - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/106/exclude b/config/rootfiles/core/106/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/core/106/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/106/filelists/attr b/config/rootfiles/core/106/filelists/attr new file mode 120000 index 0000000..c808017 --- /dev/null +++ b/config/rootfiles/core/106/filelists/attr @@ -0,0 +1 @@ +../../../common/attr \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/diffutils b/config/rootfiles/core/106/filelists/diffutils new file mode 120000 index 0000000..a5c02f3 --- /dev/null +++ b/config/rootfiles/core/106/filelists/diffutils @@ -0,0 +1 @@ +../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/ed b/config/rootfiles/core/106/filelists/ed new file mode 120000 index 0000000..0ed331c --- /dev/null +++ b/config/rootfiles/core/106/filelists/ed @@ -0,0 +1 @@ +../../../common/ed \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/expat b/config/rootfiles/core/106/filelists/expat new file mode 120000 index 0000000..e1923cf --- /dev/null +++ b/config/rootfiles/core/106/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/file b/config/rootfiles/core/106/filelists/file new file mode 120000 index 0000000..0c60e43 --- /dev/null +++ b/config/rootfiles/core/106/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files new file mode 100644 index 0000000..02b9d4c --- /dev/null +++ b/config/rootfiles/core/106/filelists/files @@ -0,0 +1,17 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/dhcp +etc/rc.d/init.d/network +etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders +etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders +etc/rc.d/init.d/unbound +etc/rc.d/rc0.d/K79unbound +etc/rc.d/rc3.d/S21unbound +etc/rc.d/rc6.d/K79unbound +srv/web/ipfire/cgi-bin/dns.cgi +srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/hosts.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/services.cgi diff --git a/config/rootfiles/core/106/filelists/flex b/config/rootfiles/core/106/filelists/flex new file mode 120000 index 0000000..feb0390 --- /dev/null +++ b/config/rootfiles/core/106/filelists/flex @@ -0,0 +1 @@ +../../../common/flex \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/gawk b/config/rootfiles/core/106/filelists/gawk new file mode 120000 index 0000000..a3bbe32 --- /dev/null +++ b/config/rootfiles/core/106/filelists/gawk @@ -0,0 +1 @@ +../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/gettext b/config/rootfiles/core/106/filelists/gettext new file mode 120000 index 0000000..b6c6c6f --- /dev/null +++ b/config/rootfiles/core/106/filelists/gettext @@ -0,0 +1 @@ +../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/gnupg b/config/rootfiles/core/106/filelists/gnupg new file mode 120000 index 0000000..a1a1564 --- /dev/null +++ b/config/rootfiles/core/106/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/i586/openssl-sse2 b/config/rootfiles/core/106/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/core/106/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/i586/strongswan-padlock b/config/rootfiles/core/106/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/core/106/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/iproute2 b/config/rootfiles/core/106/filelists/iproute2 new file mode 120000 index 0000000..05f0f71 --- /dev/null +++ b/config/rootfiles/core/106/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/ipset b/config/rootfiles/core/106/filelists/ipset new file mode 120000 index 0000000..2b43691 --- /dev/null +++ b/config/rootfiles/core/106/filelists/ipset @@ -0,0 +1 @@ +../../../common/ipset \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libgpg-error b/config/rootfiles/core/106/filelists/libgpg-error new file mode 120000 index 0000000..cad4313 --- /dev/null +++ b/config/rootfiles/core/106/filelists/libgpg-error @@ -0,0 +1 @@ +../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libjpeg b/config/rootfiles/core/106/filelists/libjpeg new file mode 120000 index 0000000..3b1a782 --- /dev/null +++ b/config/rootfiles/core/106/filelists/libjpeg @@ -0,0 +1 @@ +../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libjpeg-compat b/config/rootfiles/core/106/filelists/libjpeg-compat new file mode 120000 index 0000000..e6ff86d --- /dev/null +++ b/config/rootfiles/core/106/filelists/libjpeg-compat @@ -0,0 +1 @@ +../../../common/libjpeg-compat \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libmnl b/config/rootfiles/core/106/filelists/libmnl new file mode 120000 index 0000000..f671c41 --- /dev/null +++ b/config/rootfiles/core/106/filelists/libmnl @@ -0,0 +1 @@ +../../../common/libmnl \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/libnetfilter_conntrack b/config/rootfiles/core/106/filelists/libnetfilter_conntrack new file mode 120000 index 0000000..6ef5cc4 --- /dev/null +++ b/config/rootfiles/core/106/filelists/libnetfilter_conntrack @@ -0,0 +1 @@ +../../../common/libnetfilter_conntrack \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/misc-progs b/config/rootfiles/core/106/filelists/misc-progs new file mode 120000 index 0000000..7223cad --- /dev/null +++ b/config/rootfiles/core/106/filelists/misc-progs @@ -0,0 +1 @@ +../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/openssl b/config/rootfiles/core/106/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/106/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-daemon b/config/rootfiles/core/106/filelists/python-daemon new file mode 120000 index 0000000..8e510bb --- /dev/null +++ b/config/rootfiles/core/106/filelists/python-daemon @@ -0,0 +1 @@ +../../../common/python-daemon \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-docutils b/config/rootfiles/core/106/filelists/python-docutils new file mode 120000 index 0000000..5ae1ada --- /dev/null +++ b/config/rootfiles/core/106/filelists/python-docutils @@ -0,0 +1 @@ +../../../common/python-docutils \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-inotify b/config/rootfiles/core/106/filelists/python-inotify new file mode 120000 index 0000000..6f572c3 --- /dev/null +++ b/config/rootfiles/core/106/filelists/python-inotify @@ -0,0 +1 @@ +../../../common/python-inotify \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/python-ipaddress b/config/rootfiles/core/106/filelists/python-ipaddress new file mode 120000 index 0000000..0702482 --- /dev/null +++ b/config/rootfiles/core/106/filelists/python-ipaddress @@ -0,0 +1 @@ +../../../common/python-ipaddress \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/smartmontools b/config/rootfiles/core/106/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/106/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/squid b/config/rootfiles/core/106/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/106/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/strongswan b/config/rootfiles/core/106/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/106/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/unbound b/config/rootfiles/core/106/filelists/unbound new file mode 120000 index 0000000..66adf09 --- /dev/null +++ b/config/rootfiles/core/106/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch b/config/rootfiles/core/106/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/core/106/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch_data b/config/rootfiles/core/106/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/core/106/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/106/meta b/config/rootfiles/core/106/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/106/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/106/update.sh b/config/rootfiles/core/106/update.sh new file mode 100644 index 0000000..4d50d90 --- /dev/null +++ b/config/rootfiles/core/106/update.sh @@ -0,0 +1,91 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=106 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# Stop services +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/dnsmasq stop + +# Extract files +extract_files + +# Delete dnsmasq +rm -vf \ + /etc/rc.d/init.d/dnsmasq \ + /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq \ + /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq \ + /usr/sbin/dnsmasq + +# update linker config +ldconfig + +grep -q unbound-anchor /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig + +# Update DNS trust anchor +%daily,random * * @runas(nobody) /usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem +EOF + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/unbound start +/etc/init.d/squid start +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec start +fi + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/105/exclude b/config/rootfiles/oldcore/105/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/oldcore/105/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/105/filelists/files b/config/rootfiles/oldcore/105/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/oldcore/105/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/oldcore/105/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/105/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/105/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/105/filelists/libgcrypt b/config/rootfiles/oldcore/105/filelists/libgcrypt new file mode 120000 index 0000000..2df12a2 --- /dev/null +++ b/config/rootfiles/oldcore/105/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/oldcore/105/filelists/openssl b/config/rootfiles/oldcore/105/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/105/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/105/meta b/config/rootfiles/oldcore/105/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/105/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/105/update.sh b/config/rootfiles/oldcore/105/update.sh new file mode 100644 index 0000000..3e9f601 --- /dev/null +++ b/config/rootfiles/oldcore/105/update.sh @@ -0,0 +1,71 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=105 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# Start services + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index 1446a9f..5e97c96 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="105" # Core Level (Filename) +CORE="106" # Core Level (Filename) PAKFIRE_CORE="105" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. feba68e4af48630d0c5dcd16bd799a0e02db2b36
by git＠ipfire.org 26 Sep '16

26 Sep '16

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 feba68e4af48630d0c5dcd16bd799a0e02db2b36 (commit) from b8987235d26e4bdf99fa1c4a574a3da0c7674d07 (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 feba68e4af48630d0c5dcd16bd799a0e02db2b36 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Sat Sep 3 14:06:19 2016 +0200 libjpeg: update to 1.4.2 The old libjpeg is renamed to libjpeg-compat The compat makes the old libs maintainable Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Reviewed-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libjpeg | 19 ++++++++++++++++--- config/rootfiles/common/libjpeg-compat | 3 +++ lfs/libjpeg | 14 ++++++++------ lfs/{libjpeg => libjpeg-compat} | 2 +- make.sh | 1 + 5 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 config/rootfiles/common/libjpeg-compat copy lfs/{libjpeg => libjpeg-compat} (97%) Difference in files: diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg index 7ceb697..4df7565 100644 --- a/config/rootfiles/common/libjpeg +++ b/config/rootfiles/common/libjpeg @@ -12,13 +12,13 @@ #usr/lib/libjpeg.a #usr/lib/libjpeg.la #usr/lib/libjpeg.so -usr/lib/libjpeg.so.62 -usr/lib/libjpeg.so.62.1.0 +usr/lib/libjpeg.so.8 +usr/lib/libjpeg.so.8.0.2 #usr/lib/libturbojpeg.a #usr/lib/libturbojpeg.la #usr/lib/libturbojpeg.so usr/lib/libturbojpeg.so.0 -usr/lib/libturbojpeg.so.0.0.0 +usr/lib/libturbojpeg.so.0.1.0 #usr/man/man1/cjpeg.1 #usr/man/man1/djpeg.1 #usr/man/man1/jpegtran.1 @@ -31,3 +31,16 @@ usr/lib/libturbojpeg.so.0.0.0 #usr/share/doc/structure.txt #usr/share/doc/usage.txt #usr/share/doc/wizard.txt +#usr/share/man/man1/cjpeg.1 +#usr/share/man/man1/djpeg.1 +#usr/share/man/man1/jpegtran.1 +#usr/share/man/man1/rdjpgcom.1 +#usr/share/man/man1/wrjpgcom.1 +#usr/share/doc/libjpeg-turbo +#usr/share/doc/libjpeg-turbo/README +#usr/share/doc/libjpeg-turbo/README-turbo.txt +#usr/share/doc/libjpeg-turbo/example.c +#usr/share/doc/libjpeg-turbo/libjpeg.txt +#usr/share/doc/libjpeg-turbo/structure.txt +#usr/share/doc/libjpeg-turbo/usage.txt +#usr/share/doc/libjpeg-turbo/wizard.txt diff --git a/config/rootfiles/common/libjpeg-compat b/config/rootfiles/common/libjpeg-compat new file mode 100644 index 0000000..5e7b98d --- /dev/null +++ b/config/rootfiles/common/libjpeg-compat @@ -0,0 +1,3 @@ +usr/lib/libjpeg.so.62 +usr/lib/libjpeg.so.62.1.0 +usr/lib/libturbojpeg.so.0.0.0 diff --git a/lfs/libjpeg b/lfs/libjpeg index 8b4c077..aae2c77 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 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,15 +24,13 @@ include Config -VER = 1.3.1 +VER = 1.4.2 THISAPP = libjpeg-turbo-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libjpeg -PAK_VER = ipfire-beta1 ############################################################################### # Top-level Rules @@ -42,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05 +$(DL_FILE)_MD5 = 86b0d5f7507c2e6c21c00219162c3c44 install : $(TARGET) @@ -72,9 +70,13 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared + cd $(DIR_APP) && ./configure --prefix=/usr \ + --with-jpeg8 \ + --disable-static\ + --mandir=/usr/share/man cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) + diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat new file mode 100644 index 0000000..4166d52 --- /dev/null +++ b/lfs/libjpeg-compat @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.3.1 + +THISAPP = libjpeg-turbo-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libjpeg +PAK_VER = ipfire-beta1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared + cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && mv -vf .libs/{libjpeg.so.62.1.0,libjpeg.so.62,libturbojpeg.so.0.0.0} /usr/lib/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index e8cfa42..1446a9f 100755 --- a/make.sh +++ b/make.sh @@ -508,6 +508,7 @@ buildipfire() { ipfiremake libidn ipfiremake nasm ipfiremake libjpeg + ipfiremake libjpeg-compat ipfiremake libexif ipfiremake libpng ipfiremake libtiff hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b8987235d26e4bdf99fa1c4a574a3da0c7674d07
by git＠ipfire.org 26 Sep '16

26 Sep '16

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM September 2016