[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3ce76624346e0ce66a6f1fc3f6b37feeab1a25b2
by gitï¼ ipfire.org 23 Sep '16
by gitï¼ ipfire.org 23 Sep '16
23 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 3ce76624346e0ce66a6f1fc3f6b37feeab1a25b2 (commit)
via 2d850c7944bf0fd7bfac91436151dcecafe3f623 (commit)
via e4ee7f0317547aacd36b9b5d31f9eb659ab5f455 (commit)
from 8029c2a899b3b70e5e35f8461daddc288b9abe75 (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 3ce76624346e0ce66a6f1fc3f6b37feeab1a25b2
Merge: 8029c2a 2d850c7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Sep 23 18:49:06 2016 +0200
Merge remote-tracking branch 'origin/core105' into next
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/105/filelists/files | 2 +-
config/rootfiles/{oldcore/99 => core/105}/filelists/i586/openssl-sse2 | 0
2 files changed, 1 insertion(+), 1 deletion(-)
copy config/rootfiles/{oldcore/99 => core/105}/filelists/i586/openssl-sse2 (100%)
Difference in files:
diff --git a/config/rootfiles/core/105/filelists/files b/config/rootfiles/core/105/filelists/files
index 95f6e10..409e5fe 100644
--- a/config/rootfiles/core/105/filelists/files
+++ b/config/rootfiles/core/105/filelists/files
@@ -1,2 +1,2 @@
etc/system-release
-etc/issue
\ No newline at end of file
+etc/issue
diff --git a/config/rootfiles/core/105/filelists/i586/openssl-sse2 b/config/rootfiles/core/105/filelists/i586/openssl-sse2
new file mode 120000
index 0000000..f424713
--- /dev/null
+++ b/config/rootfiles/core/105/filelists/i586/openssl-sse2
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, core105, updated. 2d850c7944bf0fd7bfac91436151dcecafe3f623
by gitï¼ ipfire.org 23 Sep '16
by gitï¼ ipfire.org 23 Sep '16
23 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, core105 has been updated
via 2d850c7944bf0fd7bfac91436151dcecafe3f623 (commit)
from e4ee7f0317547aacd36b9b5d31f9eb659ab5f455 (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 2d850c7944bf0fd7bfac91436151dcecafe3f623
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Sep 23 10:30:34 2016 +0200
core105: add openssl sse2 binaries
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/{oldcore/99 => core/105}/filelists/i586/openssl-sse2 | 0
1 file changed, 0 insertions(+), 0 deletions(-)
copy config/rootfiles/{oldcore/99 => core/105}/filelists/i586/openssl-sse2 (100%)
Difference in files:
diff --git a/config/rootfiles/core/105/filelists/i586/openssl-sse2 b/config/rootfiles/core/105/filelists/i586/openssl-sse2
new file mode 120000
index 0000000..f424713
--- /dev/null
+++ b/config/rootfiles/core/105/filelists/i586/openssl-sse2
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, core105, updated. e4ee7f0317547aacd36b9b5d31f9eb659ab5f455
by gitï¼ ipfire.org 22 Sep '16
by gitï¼ ipfire.org 22 Sep '16
22 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, core105 has been updated
via e4ee7f0317547aacd36b9b5d31f9eb659ab5f455 (commit)
from cd805ced09c2e203e7e6b874b7b96fb5e86a11b5 (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 e4ee7f0317547aacd36b9b5d31f9eb659ab5f455
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Sep 22 17:44:06 2016 +0200
core105: fix rootfile.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/105/filelists/files | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/core/105/filelists/files b/config/rootfiles/core/105/filelists/files
index 95f6e10..409e5fe 100644
--- a/config/rootfiles/core/105/filelists/files
+++ b/config/rootfiles/core/105/filelists/files
@@ -1,2 +1,2 @@
etc/system-release
-etc/issue
\ No newline at end of file
+etc/issue
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 78647fb02210e34f700f44534bc73b401d3416bf
by gitï¼ ipfire.org 22 Sep '16
by gitï¼ ipfire.org 22 Sep '16
22 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 78647fb02210e34f700f44534bc73b401d3416bf (commit)
from 7937617827db1f328101edf8a57ec749510e6296 (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 78647fb02210e34f700f44534bc73b401d3416bf
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Thu Sep 22 12:28:22 2016 +0200
xfsprogs: Update to 4.7.0
This is an major update to the latest stable version.
* Drop dependency to e2fsprogs.
* Add dependency to libattr-devel
* Cleanup build instructions and package.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
xfsprogs/xfsprogs.nm | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
Difference in files:
diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm
index 2dded35..5041e50 100644
--- a/xfsprogs/xfsprogs.nm
+++ b/xfsprogs/xfsprogs.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xfsprogs
-version = 3.2.2
+version = 4.7.0
release = 1
groups = System/Filesystems
@@ -20,10 +20,10 @@ source_dl = ftp://oss.sgi.com/projects/xfs/cmd_tars/
build
requires
- e2fsprogs-devel
gettext
libacl-devel
- libblkid-devel
+ libattr-devel
+ libblkid-devel >= 2.17
libtool
libuuid-devel
readline-devel
@@ -34,11 +34,19 @@ build
--enable-readline=yes \
--enable-blkid=yes
- make_build_targets += V=1 DEBUG=-DNDEBUG
+ make_build_targets += \
+ V=1 DEBUG=-DNDEBUG
- install
- make install install-dev install-qa V=1 DIST_ROOT=%{BUILDROOT} \
- PKG_ROOT_SBIN_DIR=%{sbindir} PKG_ROOT_LIB_DIR=%{libdir}
+ make_install_targets += \
+ install-dev V=1 DIST_ROOT=%{BUILDROOT} \
+ PKG_ROOT_SBIN_DIR=%{sbindir} PKG_ROOT_LIB_DIR=%{libdir}
+
+ install_cmds
+ # Fix file permission.
+ chmod 0755 %{BUILDROOT}/%{libdir}/libhandle.so.*.*.*
+
+ # Remove unneeded doc location.
+ rm -rvf %{BUILDROOT}/%{datadir}/doc/xfsprogs/
end
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8029c2a899b3b70e5e35f8461daddc288b9abe75
by gitï¼ ipfire.org 22 Sep '16
by gitï¼ ipfire.org 22 Sep '16
22 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 8029c2a899b3b70e5e35f8461daddc288b9abe75 (commit)
via f5275b5930016b466e136dd6fb8ce535be618c4a (commit)
via cd805ced09c2e203e7e6b874b7b96fb5e86a11b5 (commit)
via 3bc177eec53248b296e13654003f278c65ddc413 (commit)
via 8bbed7a5b6a878dae03d605042b48304f3900304 (commit)
via db7ef87902096d8268bb348ba5821eba344e27ba (commit)
via c4a1169ed975c15ee8c29c99d0667388a09c29bf (commit)
via ad7e47072b4993d96749f4e8f0f106b409ed77ca (commit)
via 59d8f64e50bdcc339b95f306e4cebf85c36a3a4e (commit)
from bbe8e009b824aef745c9ab9718dce9a1b557f5fc (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 8029c2a899b3b70e5e35f8461daddc288b9abe75
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 22 14:47:47 2016 +0100
strongswan: Update to 5.5.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f5275b5930016b466e136dd6fb8ce535be618c4a
Merge: bbe8e00 cd805ce
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 22 12:05:13 2016 +0100
Merge branch 'core105' into next
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/strongswan | 40 +++++++++++-----
config/rootfiles/core/{104 => 105}/exclude | 0
.../{oldcore/55 => core/105}/filelists/files | 2 +-
.../{oldcore/94 => core/105}/filelists/libgcrypt | 0
.../{oldcore/99 => core/105}/filelists/openssl | 0
config/rootfiles/core/{104 => 105}/meta | 0
.../rootfiles/{oldcore/102 => core/105}/update.sh | 5 +-
config/rootfiles/oldcore/{103 => 104}/exclude | 0
.../rootfiles/{core => oldcore}/104/filelists/acl | 0
.../104/filelists/armv5tel/linux-kirkwood | 0
.../104/filelists/armv5tel/linux-multi | 0
.../104/filelists/armv5tel/linux-rpi | 0
.../rootfiles/{core => oldcore}/104/filelists/curl | 0
.../rootfiles/{core => oldcore}/104/filelists/ddns | 0
.../{core => oldcore}/104/filelists/dnsmasq | 0
.../{core => oldcore}/104/filelists/files | 0
.../{core => oldcore}/104/filelists/i586/acpid | 0
.../{core => oldcore}/104/filelists/i586/linux | 0
.../{core => oldcore}/104/filelists/iputils | 0
.../{core => oldcore}/104/filelists/libarchive | 0
.../{core => oldcore}/104/filelists/libcap | 0
.../rootfiles/{core => oldcore}/104/filelists/ntp | 0
.../{core => oldcore}/104/filelists/openssh | 0
.../rootfiles/{core => oldcore}/104/filelists/pcre | 0
.../rootfiles/{core => oldcore}/104/filelists/popt | 0
.../{core => oldcore}/104/filelists/screen | 0
.../{core => oldcore}/104/filelists/shadow | 0
.../{core => oldcore}/104/filelists/snort | 0
.../rootfiles/{core => oldcore}/104/filelists/wget | 0
.../{core => oldcore}/104/filelists/which | 0
.../{core => oldcore}/104/filelists/x86_64/acpid | 0
.../{core => oldcore}/104/filelists/x86_64/linux | 0
config/rootfiles/oldcore/{99 => 104}/meta | 0
config/rootfiles/{core => oldcore}/104/update.sh | 0
lfs/openssl | 4 +-
lfs/strongswan | 5 +-
make.sh | 4 +-
...n-event-when-deleting-redundant-CHILD_SAs.patch | 56 ----------------------
38 files changed, 36 insertions(+), 80 deletions(-)
rename config/rootfiles/core/{104 => 105}/exclude (100%)
copy config/rootfiles/{oldcore/55 => core/105}/filelists/files (65%)
copy config/rootfiles/{oldcore/94 => core/105}/filelists/libgcrypt (100%)
copy config/rootfiles/{oldcore/99 => core/105}/filelists/openssl (100%)
rename config/rootfiles/core/{104 => 105}/meta (100%)
copy config/rootfiles/{oldcore/102 => core/105}/update.sh (99%)
copy config/rootfiles/oldcore/{103 => 104}/exclude (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/acl (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-kirkwood (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-multi (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-rpi (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/curl (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/ddns (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/dnsmasq (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/i586/acpid (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/i586/linux (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/iputils (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/libarchive (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/libcap (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/ntp (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/openssh (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/pcre (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/popt (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/screen (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/shadow (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/snort (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/wget (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/which (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/x86_64/acpid (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/x86_64/linux (100%)
copy config/rootfiles/oldcore/{99 => 104}/meta (100%)
rename config/rootfiles/{core => oldcore}/104/update.sh (100%)
delete mode 100644 src/patches/strongswan-child-rekey-Suppress-updown-event-when-deleting-redundant-CHILD_SAs.patch
Difference in files:
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index f51cc3a..f81a9c8 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -40,7 +40,6 @@ etc/strongswan.d/charon/kernel-netlink.conf
etc/strongswan.d/charon/md5.conf
etc/strongswan.d/charon/nonce.conf
etc/strongswan.d/charon/openssl.conf
-#etc/strongswan.d/charon/padlock.conf
etc/strongswan.d/charon/pem.conf
etc/strongswan.d/charon/pgp.conf
etc/strongswan.d/charon/pkcs1.conf
@@ -58,6 +57,7 @@ etc/strongswan.d/charon/socket-default.conf
etc/strongswan.d/charon/sshkey.conf
etc/strongswan.d/charon/stroke.conf
etc/strongswan.d/charon/updown.conf
+etc/strongswan.d/charon/vici.conf
etc/strongswan.d/charon/x509.conf
etc/strongswan.d/charon/xauth-eap.conf
etc/strongswan.d/charon/xauth-generic.conf
@@ -66,6 +66,21 @@ etc/strongswan.d/charon/xcbc.conf
etc/strongswan.d/pki.conf
etc/strongswan.d/scepclient.conf
etc/strongswan.d/starter.conf
+etc/strongswan.d/swanctl.conf
+#etc/swanctl
+etc/swanctl/bliss
+etc/swanctl/ecdsa
+etc/swanctl/pkcs12
+etc/swanctl/pkcs8
+etc/swanctl/pubkey
+etc/swanctl/rsa
+etc/swanctl/swanctl.conf
+etc/swanctl/x509
+etc/swanctl/x509aa
+etc/swanctl/x509ac
+etc/swanctl/x509ca
+etc/swanctl/x509crl
+etc/swanctl/x509ocsp
usr/bin/pki
#usr/lib/ipsec
#usr/lib/ipsec/libcharon.a
@@ -73,11 +88,6 @@ usr/bin/pki
usr/lib/ipsec/libcharon.so
usr/lib/ipsec/libcharon.so.0
usr/lib/ipsec/libcharon.so.0.0.0
-#usr/lib/ipsec/libhydra.a
-#usr/lib/ipsec/libhydra.la
-usr/lib/ipsec/libhydra.so
-usr/lib/ipsec/libhydra.so.0
-usr/lib/ipsec/libhydra.so.0.0.0
#usr/lib/ipsec/libradius.a
#usr/lib/ipsec/libradius.la
usr/lib/ipsec/libradius.so
@@ -93,6 +103,11 @@ usr/lib/ipsec/libstrongswan.so.0.0.0
usr/lib/ipsec/libtls.so
usr/lib/ipsec/libtls.so.0
usr/lib/ipsec/libtls.so.0.0.0
+#usr/lib/ipsec/libvici.a
+#usr/lib/ipsec/libvici.la
+usr/lib/ipsec/libvici.so
+usr/lib/ipsec/libvici.so.0
+usr/lib/ipsec/libvici.so.0.0.0
#usr/lib/ipsec/plugins
usr/lib/ipsec/plugins/libstrongswan-aes.so
usr/lib/ipsec/plugins/libstrongswan-attr.so
@@ -101,8 +116,8 @@ usr/lib/ipsec/plugins/libstrongswan-cmac.so
usr/lib/ipsec/plugins/libstrongswan-constraints.so
usr/lib/ipsec/plugins/libstrongswan-ctr.so
usr/lib/ipsec/plugins/libstrongswan-curl.so
-usr/lib/ipsec/plugins/libstrongswan-dhcp.so
usr/lib/ipsec/plugins/libstrongswan-des.so
+usr/lib/ipsec/plugins/libstrongswan-dhcp.so
usr/lib/ipsec/plugins/libstrongswan-dnskey.so
usr/lib/ipsec/plugins/libstrongswan-eap-identity.so
usr/lib/ipsec/plugins/libstrongswan-eap-mschapv2.so
@@ -120,7 +135,6 @@ usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so
usr/lib/ipsec/plugins/libstrongswan-md5.so
usr/lib/ipsec/plugins/libstrongswan-nonce.so
usr/lib/ipsec/plugins/libstrongswan-openssl.so
-#usr/lib/ipsec/plugins/libstrongswan-padlock.so
usr/lib/ipsec/plugins/libstrongswan-pem.so
usr/lib/ipsec/plugins/libstrongswan-pgp.so
usr/lib/ipsec/plugins/libstrongswan-pkcs1.so
@@ -130,7 +144,6 @@ usr/lib/ipsec/plugins/libstrongswan-pkcs8.so
usr/lib/ipsec/plugins/libstrongswan-pubkey.so
usr/lib/ipsec/plugins/libstrongswan-random.so
usr/lib/ipsec/plugins/libstrongswan-rc2.so
-#usr/lib/ipsec/plugins/libstrongswan-rdrand.so
usr/lib/ipsec/plugins/libstrongswan-resolve.so
usr/lib/ipsec/plugins/libstrongswan-revocation.so
usr/lib/ipsec/plugins/libstrongswan-sha1.so
@@ -139,6 +152,7 @@ usr/lib/ipsec/plugins/libstrongswan-socket-default.so
usr/lib/ipsec/plugins/libstrongswan-sshkey.so
usr/lib/ipsec/plugins/libstrongswan-stroke.so
usr/lib/ipsec/plugins/libstrongswan-updown.so
+usr/lib/ipsec/plugins/libstrongswan-vici.so
usr/lib/ipsec/plugins/libstrongswan-x509.so
usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
usr/lib/ipsec/plugins/libstrongswan-xauth-generic.so
@@ -152,6 +166,7 @@ usr/libexec/ipsec/scepclient
usr/libexec/ipsec/starter
usr/libexec/ipsec/stroke
usr/sbin/ipsec
+usr/sbin/swanctl
#usr/share/man/man1/pki---acert.1
#usr/share/man/man1/pki---dn.1
#usr/share/man/man1/pki---gen.1
@@ -168,10 +183,10 @@ usr/sbin/ipsec
#usr/share/man/man5/ipsec.conf.5
#usr/share/man/man5/ipsec.secrets.5
#usr/share/man/man5/strongswan.conf.5
-#usr/share/man/man8/_updown.8
+#usr/share/man/man5/swanctl.conf.5
#usr/share/man/man8/ipsec.8
-#usr/share/man/man8/openac.8
#usr/share/man/man8/scepclient.8
+#usr/share/man/man8/swanctl.8
#usr/share/strongswan
#usr/share/strongswan/templates
#usr/share/strongswan/templates/config
@@ -202,7 +217,6 @@ usr/sbin/ipsec
#usr/share/strongswan/templates/config/plugins/md5.conf
#usr/share/strongswan/templates/config/plugins/nonce.conf
#usr/share/strongswan/templates/config/plugins/openssl.conf
-#usr/share/strongswan/templates/config/plugins/padlock.conf
#usr/share/strongswan/templates/config/plugins/pem.conf
#usr/share/strongswan/templates/config/plugins/pgp.conf
#usr/share/strongswan/templates/config/plugins/pkcs1.conf
@@ -220,6 +234,7 @@ usr/sbin/ipsec
#usr/share/strongswan/templates/config/plugins/sshkey.conf
#usr/share/strongswan/templates/config/plugins/stroke.conf
#usr/share/strongswan/templates/config/plugins/updown.conf
+#usr/share/strongswan/templates/config/plugins/vici.conf
#usr/share/strongswan/templates/config/plugins/x509.conf
#usr/share/strongswan/templates/config/plugins/xauth-eap.conf
#usr/share/strongswan/templates/config/plugins/xauth-generic.conf
@@ -232,3 +247,4 @@ usr/sbin/ipsec
#usr/share/strongswan/templates/config/strongswan.d/pki.conf
#usr/share/strongswan/templates/config/strongswan.d/scepclient.conf
#usr/share/strongswan/templates/config/strongswan.d/starter.conf
+#usr/share/strongswan/templates/config/strongswan.d/swanctl.conf
diff --git a/config/rootfiles/core/104/exclude b/config/rootfiles/core/104/exclude
deleted file mode 100644
index 7ddeae0..0000000
--- a/config/rootfiles/core/104/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/104/filelists/acl b/config/rootfiles/core/104/filelists/acl
deleted file mode 120000
index d819f9c..0000000
--- a/config/rootfiles/core/104/filelists/acl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/acl
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood
deleted file mode 120000
index 7217107..0000000
--- a/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-multi b/config/rootfiles/core/104/filelists/armv5tel/linux-multi
deleted file mode 120000
index 204eb4c..0000000
--- a/config/rootfiles/core/104/filelists/armv5tel/linux-multi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-rpi b/config/rootfiles/core/104/filelists/armv5tel/linux-rpi
deleted file mode 120000
index a651a49..0000000
--- a/config/rootfiles/core/104/filelists/armv5tel/linux-rpi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/curl b/config/rootfiles/core/104/filelists/curl
deleted file mode 120000
index 4b84bef..0000000
--- a/config/rootfiles/core/104/filelists/curl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/curl
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/ddns b/config/rootfiles/core/104/filelists/ddns
deleted file mode 120000
index 7395164..0000000
--- a/config/rootfiles/core/104/filelists/ddns
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/dnsmasq b/config/rootfiles/core/104/filelists/dnsmasq
deleted file mode 120000
index d469c74..0000000
--- a/config/rootfiles/core/104/filelists/dnsmasq
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files
deleted file mode 100644
index c172c14..0000000
--- a/config/rootfiles/core/104/filelists/files
+++ /dev/null
@@ -1,14 +0,0 @@
-etc/system-release
-etc/issue
-etc/collectd.conf
-etc/httpd/conf/global.conf
-etc/rc.d/init.d/snort
-opt/pakfire/lib/functions.sh
-srv/web/ipfire/cgi-bin/ids.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-srv/web/ipfire/html/themes/ipfire/include/functions.pl
-srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
-var/ipfire/langs
-var/ipfire/fwhosts/customservices.default
-var/ipfire/updatexlrator/bin/download
diff --git a/config/rootfiles/core/104/filelists/i586/acpid b/config/rootfiles/core/104/filelists/i586/acpid
deleted file mode 120000
index 21d36ee..0000000
--- a/config/rootfiles/core/104/filelists/i586/acpid
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/acpid
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/i586/linux b/config/rootfiles/core/104/filelists/i586/linux
deleted file mode 120000
index 693ec4b..0000000
--- a/config/rootfiles/core/104/filelists/i586/linux
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/iputils b/config/rootfiles/core/104/filelists/iputils
deleted file mode 120000
index 361c28f..0000000
--- a/config/rootfiles/core/104/filelists/iputils
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/iputils
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/libarchive b/config/rootfiles/core/104/filelists/libarchive
deleted file mode 120000
index 551f1f7..0000000
--- a/config/rootfiles/core/104/filelists/libarchive
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libarchive
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/libcap b/config/rootfiles/core/104/filelists/libcap
deleted file mode 120000
index ed67d95..0000000
--- a/config/rootfiles/core/104/filelists/libcap
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libcap
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/ntp b/config/rootfiles/core/104/filelists/ntp
deleted file mode 120000
index 7542d86..0000000
--- a/config/rootfiles/core/104/filelists/ntp
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/openssh b/config/rootfiles/core/104/filelists/openssh
deleted file mode 120000
index d8c77fd..0000000
--- a/config/rootfiles/core/104/filelists/openssh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/pcre b/config/rootfiles/core/104/filelists/pcre
deleted file mode 120000
index b390d9a..0000000
--- a/config/rootfiles/core/104/filelists/pcre
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/pcre
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/popt b/config/rootfiles/core/104/filelists/popt
deleted file mode 120000
index d71a9ab..0000000
--- a/config/rootfiles/core/104/filelists/popt
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/popt
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/screen b/config/rootfiles/core/104/filelists/screen
deleted file mode 120000
index 81008f4..0000000
--- a/config/rootfiles/core/104/filelists/screen
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/screen
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/shadow b/config/rootfiles/core/104/filelists/shadow
deleted file mode 120000
index c0824b7..0000000
--- a/config/rootfiles/core/104/filelists/shadow
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/shadow
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/snort b/config/rootfiles/core/104/filelists/snort
deleted file mode 120000
index 9406ce0..0000000
--- a/config/rootfiles/core/104/filelists/snort
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/wget b/config/rootfiles/core/104/filelists/wget
deleted file mode 120000
index fcb57df..0000000
--- a/config/rootfiles/core/104/filelists/wget
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/wget
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/which b/config/rootfiles/core/104/filelists/which
deleted file mode 120000
index 9cfc884..0000000
--- a/config/rootfiles/core/104/filelists/which
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/which
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/x86_64/acpid b/config/rootfiles/core/104/filelists/x86_64/acpid
deleted file mode 120000
index 289f8f5..0000000
--- a/config/rootfiles/core/104/filelists/x86_64/acpid
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/acpid
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/x86_64/linux b/config/rootfiles/core/104/filelists/x86_64/linux
deleted file mode 120000
index 0615b5b..0000000
--- a/config/rootfiles/core/104/filelists/x86_64/linux
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/104/meta b/config/rootfiles/core/104/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/104/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh
deleted file mode 100644
index 0223923..0000000
--- a/config/rootfiles/core/104/update.sh
+++ /dev/null
@@ -1,254 +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
-
-function find_device() {
- local mountpoint="${1}"
-
- local root
- local dev mp fs flags rest
- while read -r dev mp fs flags rest; do
- # Skip unwanted entries
- [ "${dev}" = "rootfs" ] && continue
-
- if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then
- root="$(basename "${dev}")"
- break
- fi
- done < /proc/mounts
-
- # Get the actual device from the partition that holds /
- while [ -n "${root}" ]; do
- if [ -e "/sys/block/${root}" ]; then
- echo "${root}"
- return 0
- fi
-
- # Remove last character
- root="${root::-1}"
- done
-
- return 1
-}
-
-
-core=104
-
-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
-
-#
-# Do some sanity checks.
-case $(uname -r) in
- *-ipfire* )
- # Ok.
- ;;
- * )
- exit_with_error "ERROR cannot update. No IPFire Kernel." 1
- ;;
-esac
-
-
-#
-#
-KVER="xxxKVERxxx"
-
-# Check diskspace on root
-ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
-
-if [ $ROOTSPACE -lt 100000 ]; then
- exit_with_error "ERROR cannot update because not enough free space on root." 2
- exit 2
-fi
-
-echo
-echo Update Kernel to $KVER ...
-#
-# Remove old kernel, configs, initrd, modules, dtb's ...
-#
-rm -rf /boot/System.map-*
-rm -rf /boot/config-*
-rm -rf /boot/ipfirerd-*
-rm -rf /boot/initramfs-*
-rm -rf /boot/vmlinuz-*
-rm -rf /boot/uImage-ipfire-*
-rm -rf /boot/zImage-ipfire-*
-rm -rf /boot/uInit-ipfire-*
-rm -rf /boot/dtb-*-ipfire-*
-rm -rf /lib/modules
-
-case "$(uname -m)" in
- armv*)
- # Backup uEnv.txt if exist
- if [ -e /boot/uEnv.txt ]; then
- cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
- fi
-
- # work around the u-boot folder detection bug
- mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
- mkdir -pv /boot/dtb-$KVER-ipfire-multi
- touch /boot/uImage-ipfire-kirkwood
- touch /boot/zImage-ipfire-multi
- touch /boot/uIinit-ipfire-kirkwood
- touch /boot/uIinit-ipfire-multi
- ;;
-esac
-
-# Stop services
-/etc/init.d/collectd stop
-/etc/init.d/snort stop
-/etc/init.d/squid stop
-/etc/init.d/dnsmasq stop
-/etc/init.d/sshd stop
-/etc/init.d/ipsec stop
-/etc/init.d/apache stop
-
-# Extract files
-tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
-
-# Remove some old files
-rm -f /bin/groups /lib/libshadow.so.0*
-
-# update linker config
-ldconfig
-
-# Check diskspace on boot
-BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
-
-if [ $BOOTSPACE -lt 1000 ]; then
- case $(uname -r) in
- *-ipfire-kirkwood )
- # Special handling for old kirkwood images.
- # (install only kirkwood kernel)
- rm -rf /boot/*
- # work around the u-boot folder detection bug
- mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
- tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
- --numeric-owner -C / --wildcards 'boot/*-kirkwood*'
- ;;
- * )
- /etc/init.d/apache start
- exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4
- ;;
- esac
-fi
-
-# Update Language cache
-/usr/local/bin/update-lang-cache
-
-#
-# Start services
-#
-/etc/init.d/collectd start
-/etc/init.d/apache start
-/etc/init.d/dnsmasq start
-/etc/init.d/sshd start
-/etc/init.d/squid start
-/etc/init.d/snort start
-if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
- /etc/init.d/ipsec start
-fi
-
-# Delete old QoS enabled indicator
-rm -f /var/ipfire/qos/enable
-
-# Upadate Kernel version uEnv.txt
-if [ -e /boot/uEnv.txt ]; then
- sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
-fi
-
-# call user update script (needed for some arm boards)
-if [ -e /boot/pakfire-kernel-update ]; then
- /boot/pakfire-kernel-update ${KVER}
-fi
-
-case "$(uname -m)" in
- i?86)
- # Force (re)install pae kernel if pae is supported
- rm -rf /opt/pakfire/db/installed/meta-linux-pae
- if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
- ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
- BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
- if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
- /usr/bin/logger -p syslog.emerg -t ipfire \
- "core-update-${core}: WARNING not enough space for pae kernel."
- else
- echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
- echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
- echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
- fi
- fi
- ;;
-esac
-#
-# After pakfire has ended run it again and update the lists and do upgrade
-#
-echo '#!/bin/bash' > /tmp/pak_update
-echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
-echo ' sleep 1' >> /tmp/pak_update
-echo 'done' >> /tmp/pak_update
-echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
-echo ' sleep 1' >> /tmp/pak_update
-echo 'done' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
-echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
-#
-killall -KILL pak_update
-chmod +x /tmp/pak_update
-/tmp/pak_update &
-
-sync
-
-# 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/105/exclude b/config/rootfiles/core/105/exclude
new file mode 100644
index 0000000..7ddeae0
--- /dev/null
+++ b/config/rootfiles/core/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/core/105/filelists/files b/config/rootfiles/core/105/filelists/files
new file mode 100644
index 0000000..95f6e10
--- /dev/null
+++ b/config/rootfiles/core/105/filelists/files
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
\ No newline at end of file
diff --git a/config/rootfiles/core/105/filelists/libgcrypt b/config/rootfiles/core/105/filelists/libgcrypt
new file mode 120000
index 0000000..2df12a2
--- /dev/null
+++ b/config/rootfiles/core/105/filelists/libgcrypt
@@ -0,0 +1 @@
+../../../common/libgcrypt
\ No newline at end of file
diff --git a/config/rootfiles/core/105/filelists/openssl b/config/rootfiles/core/105/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/105/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/105/meta b/config/rootfiles/core/105/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/105/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/105/update.sh b/config/rootfiles/core/105/update.sh
new file mode 100644
index 0000000..3e9f601
--- /dev/null
+++ b/config/rootfiles/core/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/config/rootfiles/oldcore/104/exclude b/config/rootfiles/oldcore/104/exclude
new file mode 100644
index 0000000..7ddeae0
--- /dev/null
+++ b/config/rootfiles/oldcore/104/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/104/filelists/acl b/config/rootfiles/oldcore/104/filelists/acl
new file mode 120000
index 0000000..d819f9c
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/acl
@@ -0,0 +1 @@
+../../../common/acl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood
new file mode 120000
index 0000000..7217107
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi
new file mode 120000
index 0000000..204eb4c
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi
new file mode 120000
index 0000000..a651a49
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/curl b/config/rootfiles/oldcore/104/filelists/curl
new file mode 120000
index 0000000..4b84bef
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/curl
@@ -0,0 +1 @@
+../../../common/curl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/ddns b/config/rootfiles/oldcore/104/filelists/ddns
new file mode 120000
index 0000000..7395164
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/ddns
@@ -0,0 +1 @@
+../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/dnsmasq b/config/rootfiles/oldcore/104/filelists/dnsmasq
new file mode 120000
index 0000000..d469c74
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/dnsmasq
@@ -0,0 +1 @@
+../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/files b/config/rootfiles/oldcore/104/filelists/files
new file mode 100644
index 0000000..c172c14
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/files
@@ -0,0 +1,14 @@
+etc/system-release
+etc/issue
+etc/collectd.conf
+etc/httpd/conf/global.conf
+etc/rc.d/init.d/snort
+opt/pakfire/lib/functions.sh
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/html/themes/ipfire/include/functions.pl
+srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
+var/ipfire/langs
+var/ipfire/fwhosts/customservices.default
+var/ipfire/updatexlrator/bin/download
diff --git a/config/rootfiles/oldcore/104/filelists/i586/acpid b/config/rootfiles/oldcore/104/filelists/i586/acpid
new file mode 120000
index 0000000..21d36ee
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/i586/acpid
@@ -0,0 +1 @@
+../../../../common/i586/acpid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/i586/linux b/config/rootfiles/oldcore/104/filelists/i586/linux
new file mode 120000
index 0000000..693ec4b
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/iputils b/config/rootfiles/oldcore/104/filelists/iputils
new file mode 120000
index 0000000..361c28f
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/iputils
@@ -0,0 +1 @@
+../../../common/iputils
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/libarchive b/config/rootfiles/oldcore/104/filelists/libarchive
new file mode 120000
index 0000000..551f1f7
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/libarchive
@@ -0,0 +1 @@
+../../../common/libarchive
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/libcap b/config/rootfiles/oldcore/104/filelists/libcap
new file mode 120000
index 0000000..ed67d95
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/libcap
@@ -0,0 +1 @@
+../../../common/libcap
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/ntp b/config/rootfiles/oldcore/104/filelists/ntp
new file mode 120000
index 0000000..7542d86
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/ntp
@@ -0,0 +1 @@
+../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/openssh b/config/rootfiles/oldcore/104/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/pcre b/config/rootfiles/oldcore/104/filelists/pcre
new file mode 120000
index 0000000..b390d9a
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/pcre
@@ -0,0 +1 @@
+../../../common/pcre
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/popt b/config/rootfiles/oldcore/104/filelists/popt
new file mode 120000
index 0000000..d71a9ab
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/popt
@@ -0,0 +1 @@
+../../../common/popt
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/screen b/config/rootfiles/oldcore/104/filelists/screen
new file mode 120000
index 0000000..81008f4
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/screen
@@ -0,0 +1 @@
+../../../common/screen
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/shadow b/config/rootfiles/oldcore/104/filelists/shadow
new file mode 120000
index 0000000..c0824b7
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/shadow
@@ -0,0 +1 @@
+../../../common/shadow
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/snort b/config/rootfiles/oldcore/104/filelists/snort
new file mode 120000
index 0000000..9406ce0
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/snort
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/wget b/config/rootfiles/oldcore/104/filelists/wget
new file mode 120000
index 0000000..fcb57df
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/which b/config/rootfiles/oldcore/104/filelists/which
new file mode 120000
index 0000000..9cfc884
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/which
@@ -0,0 +1 @@
+../../../common/which
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/x86_64/acpid b/config/rootfiles/oldcore/104/filelists/x86_64/acpid
new file mode 120000
index 0000000..289f8f5
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/x86_64/acpid
@@ -0,0 +1 @@
+../../../../common/x86_64/acpid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/x86_64/linux b/config/rootfiles/oldcore/104/filelists/x86_64/linux
new file mode 120000
index 0000000..0615b5b
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/meta b/config/rootfiles/oldcore/104/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/104/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/104/update.sh b/config/rootfiles/oldcore/104/update.sh
new file mode 100644
index 0000000..0223923
--- /dev/null
+++ b/config/rootfiles/oldcore/104/update.sh
@@ -0,0 +1,254 @@
+#!/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
+
+function find_device() {
+ local mountpoint="${1}"
+
+ local root
+ local dev mp fs flags rest
+ while read -r dev mp fs flags rest; do
+ # Skip unwanted entries
+ [ "${dev}" = "rootfs" ] && continue
+
+ if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then
+ root="$(basename "${dev}")"
+ break
+ fi
+ done < /proc/mounts
+
+ # Get the actual device from the partition that holds /
+ while [ -n "${root}" ]; do
+ if [ -e "/sys/block/${root}" ]; then
+ echo "${root}"
+ return 0
+ fi
+
+ # Remove last character
+ root="${root::-1}"
+ done
+
+ return 1
+}
+
+
+core=104
+
+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
+
+#
+# Do some sanity checks.
+case $(uname -r) in
+ *-ipfire* )
+ # Ok.
+ ;;
+ * )
+ exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+ ;;
+esac
+
+
+#
+#
+KVER="xxxKVERxxx"
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+ exit_with_error "ERROR cannot update because not enough free space on root." 2
+ exit 2
+fi
+
+echo
+echo Update Kernel to $KVER ...
+#
+# Remove old kernel, configs, initrd, modules, dtb's ...
+#
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-ipfire-*
+rm -rf /boot/zImage-ipfire-*
+rm -rf /boot/uInit-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+
+case "$(uname -m)" in
+ armv*)
+ # Backup uEnv.txt if exist
+ if [ -e /boot/uEnv.txt ]; then
+ cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+ fi
+
+ # work around the u-boot folder detection bug
+ mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
+ mkdir -pv /boot/dtb-$KVER-ipfire-multi
+ touch /boot/uImage-ipfire-kirkwood
+ touch /boot/zImage-ipfire-multi
+ touch /boot/uIinit-ipfire-kirkwood
+ touch /boot/uIinit-ipfire-multi
+ ;;
+esac
+
+# Stop services
+/etc/init.d/collectd stop
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+/etc/init.d/dnsmasq stop
+/etc/init.d/sshd stop
+/etc/init.d/ipsec stop
+/etc/init.d/apache stop
+
+# Extract files
+tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
+
+# Remove some old files
+rm -f /bin/groups /lib/libshadow.so.0*
+
+# update linker config
+ldconfig
+
+# Check diskspace on boot
+BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $BOOTSPACE -lt 1000 ]; then
+ case $(uname -r) in
+ *-ipfire-kirkwood )
+ # Special handling for old kirkwood images.
+ # (install only kirkwood kernel)
+ rm -rf /boot/*
+ # work around the u-boot folder detection bug
+ mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
+ tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
+ --numeric-owner -C / --wildcards 'boot/*-kirkwood*'
+ ;;
+ * )
+ /etc/init.d/apache start
+ exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4
+ ;;
+ esac
+fi
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+#
+# Start services
+#
+/etc/init.d/collectd start
+/etc/init.d/apache start
+/etc/init.d/dnsmasq start
+/etc/init.d/sshd start
+/etc/init.d/squid start
+/etc/init.d/snort start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+# Delete old QoS enabled indicator
+rm -f /var/ipfire/qos/enable
+
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+ sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+ /boot/pakfire-kernel-update ${KVER}
+fi
+
+case "$(uname -m)" in
+ i?86)
+ # Force (re)install pae kernel if pae is supported
+ rm -rf /opt/pakfire/db/installed/meta-linux-pae
+ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+ ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: WARNING not enough space for pae kernel."
+ else
+ echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+ echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ fi
+ fi
+ ;;
+esac
+#
+# After pakfire has ended run it again and update the lists and do upgrade
+#
+echo '#!/bin/bash' > /tmp/pak_update
+echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
+echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
+#
+killall -KILL pak_update
+chmod +x /tmp/pak_update
+/tmp/pak_update &
+
+sync
+
+# 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/lfs/openssl b/lfs/openssl
index 0a0b2cf..d0ed4d3 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
include Config
-VER = 1.0.2h
+VER = 1.0.2i
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -87,7 +87,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9392e65072ce4b614c1392eefc1f23d0
+$(DL_FILE)_MD5 = 678374e63f8df456a697d3e5e5a931fb
install : $(TARGET)
diff --git a/lfs/strongswan b/lfs/strongswan
index c6d655b..17c1a01 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER = 5.3.5
+VER = 5.5.0
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a2f9ea185f27e7f8413d4cd2ee61efe4
+$(DL_FILE)_MD5 = a96fa7eb6c62b40143dadb064b6bd586
install : $(TARGET)
@@ -79,7 +79,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/strongswan-child-rekey-Suppress-updown-event-when-deleting-redundant-CHILD_SAs.patch
cd $(DIR_APP) && ./configure \
--prefix="/usr" \
diff --git a/make.sh b/make.sh
index 951f3dc..e1a6233 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.19" # Version number
-CORE="104" # Core Level (Filename)
-PAKFIRE_CORE="104" # Core Level (PAKFIRE)
+CORE="105" # 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
CONFIG_ROOT=/var/ipfire # Configuration rootdir
diff --git a/src/patches/strongswan-child-rekey-Suppress-updown-event-when-deleting-redundant-CHILD_SAs.patch b/src/patches/strongswan-child-rekey-Suppress-updown-event-when-deleting-redundant-CHILD_SAs.patch
deleted file mode 100644
index 27b6f06..0000000
--- a/src/patches/strongswan-child-rekey-Suppress-updown-event-when-deleting-redundant-CHILD_SAs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0e32cbc0bc8fce3319491db360fb23b16561ec58 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias(a)strongswan.org>
-Date: Tue, 15 Dec 2015 17:15:32 +0100
-Subject: [PATCH] child-rekey: Suppress updown event when deleting redundant
- CHILD_SAs
-
-When handling a rekey collision we might have to delete an already
-installed redundant CHILD_SA (or expect the other peer to do so). We don't
-want to trigger updown events for these as we don't during rekeying.
-
-Instead of setting the state to CHILD_REKEYING we could maybe use
-CHILD_REKEYED, which we currently only use for IKEv1, and set it for
-all CHILD_SAs we delete or expect the other peer to delete. Would need
-a small change in child-delete too. Or we could introduce a new state.
-
- #853.
----
- src/libcharon/sa/ikev2/tasks/child_rekey.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/libcharon/sa/ikev2/tasks/child_rekey.c b/src/libcharon/sa/ikev2/tasks/child_rekey.c
-index c7a8a13..6f0c2b2 100644
---- a/src/libcharon/sa/ikev2/tasks/child_rekey.c
-+++ b/src/libcharon/sa/ikev2/tasks/child_rekey.c
-@@ -279,11 +279,15 @@ static child_sa_t *handle_collision(private_child_rekey_t *this)
- /* don't touch child other created, it has already been deleted */
- if (!this->other_child_destroyed)
- {
-- /* disable close action for the redundand child */
-+ /* disable close action and updown event for redundant child */
- child_sa = other->child_create->get_child(other->child_create);
- if (child_sa)
- {
- child_sa->set_close_action(child_sa, ACTION_NONE);
-+ if (child_sa->get_state(child_sa) != CHILD_REKEYING)
-+ {
-+ child_sa->set_state(child_sa, CHILD_REKEYING);
-+ }
- }
- }
- }
-@@ -372,6 +376,11 @@ METHOD(task_t, process_i, status_t,
- {
- return SUCCESS;
- }
-+ /* disable updown event for redundant CHILD_SA */
-+ if (to_delete->get_state(to_delete) != CHILD_REKEYING)
-+ {
-+ to_delete->set_state(to_delete, CHILD_REKEYING);
-+ }
- spi = to_delete->get_spi(to_delete, TRUE);
- protocol = to_delete->get_protocol(to_delete);
-
---
-1.7.9.5
-
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. cd805ced09c2e203e7e6b874b7b96fb5e86a11b5
by gitï¼ ipfire.org 22 Sep '16
by gitï¼ ipfire.org 22 Sep '16
22 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, master has been updated
via cd805ced09c2e203e7e6b874b7b96fb5e86a11b5 (commit)
via 3bc177eec53248b296e13654003f278c65ddc413 (commit)
via 8bbed7a5b6a878dae03d605042b48304f3900304 (commit)
via db7ef87902096d8268bb348ba5821eba344e27ba (commit)
via c4a1169ed975c15ee8c29c99d0667388a09c29bf (commit)
from ad7e47072b4993d96749f4e8f0f106b409ed77ca (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 cd805ced09c2e203e7e6b874b7b96fb5e86a11b5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 22 12:04:18 2016 +0100
Tag Core Update 105
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3bc177eec53248b296e13654003f278c65ddc413
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 22 12:02:32 2016 +0100
openssl: Update to 1.0.2i
https://www.openssl.org/news/openssl-1.0.2-notes.html
This release fixes various security flaws:
* OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
* SWEET32 Mitigation (CVE-2016-2183)
* OOB write in MDC2_Update() (CVE-2016-6303)
* Malformed SHA512 ticket DoS (CVE-2016-6302)
* OOB write in BN_bn2dec() (CVE-2016-2182)
* OOB read in TS_OBJ_print_bio() (CVE-2016-2180)
* Pointer arithmetic undefined behaviour (CVE-2016-2177)
* Constant time flag not preserved in DSA signing (CVE-2016-2178)
* DTLS buffered message DoS (CVE-2016-2179)
* DTLS replay protection DoS (CVE-2016-2181)
* Certificate message OOB reads (CVE-2016-6306)
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8bbed7a5b6a878dae03d605042b48304f3900304
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 22 10:30:28 2016 +0100
core105: Ship security update for libgcrypt
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit db7ef87902096d8268bb348ba5821eba344e27ba
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Aug 20 12:33:55 2016 +0200
libgcrypt: Update to 1.7.3
Fixes CVE-2016-6313
For details, see:
https://lists.gnupg.org/pipermail/gnupg-announce/2016q3/000395.html
https://bugzilla.redhat.com/show_bug.cgi?id=1366105
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c4a1169ed975c15ee8c29c99d0667388a09c29bf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 22 10:28:36 2016 +0100
Start Core Update 105
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/libgcrypt | 2 +-
config/rootfiles/core/{104 => 105}/exclude | 0
config/rootfiles/{oldcore/55 => core/105}/filelists/files | 2 +-
config/rootfiles/{oldcore/94 => core/105}/filelists/libgcrypt | 0
config/rootfiles/{oldcore/99 => core/105}/filelists/openssl | 0
config/rootfiles/core/{104 => 105}/meta | 0
config/rootfiles/{oldcore/102 => core/105}/update.sh | 5 +----
config/rootfiles/oldcore/{103 => 104}/exclude | 0
config/rootfiles/{core => oldcore}/104/filelists/acl | 0
.../{core => oldcore}/104/filelists/armv5tel/linux-kirkwood | 0
.../rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-multi | 0
config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-rpi | 0
config/rootfiles/{core => oldcore}/104/filelists/curl | 0
config/rootfiles/{core => oldcore}/104/filelists/ddns | 0
config/rootfiles/{core => oldcore}/104/filelists/dnsmasq | 0
config/rootfiles/{core => oldcore}/104/filelists/files | 0
config/rootfiles/{core => oldcore}/104/filelists/i586/acpid | 0
config/rootfiles/{core => oldcore}/104/filelists/i586/linux | 0
config/rootfiles/{core => oldcore}/104/filelists/iputils | 0
config/rootfiles/{core => oldcore}/104/filelists/libarchive | 0
config/rootfiles/{core => oldcore}/104/filelists/libcap | 0
config/rootfiles/{core => oldcore}/104/filelists/ntp | 0
config/rootfiles/{core => oldcore}/104/filelists/openssh | 0
config/rootfiles/{core => oldcore}/104/filelists/pcre | 0
config/rootfiles/{core => oldcore}/104/filelists/popt | 0
config/rootfiles/{core => oldcore}/104/filelists/screen | 0
config/rootfiles/{core => oldcore}/104/filelists/shadow | 0
config/rootfiles/{core => oldcore}/104/filelists/snort | 0
config/rootfiles/{core => oldcore}/104/filelists/wget | 0
config/rootfiles/{core => oldcore}/104/filelists/which | 0
config/rootfiles/{core => oldcore}/104/filelists/x86_64/acpid | 0
config/rootfiles/{core => oldcore}/104/filelists/x86_64/linux | 0
config/rootfiles/oldcore/{99 => 104}/meta | 0
config/rootfiles/{core => oldcore}/104/update.sh | 0
lfs/libgcrypt | 6 +++---
lfs/openssl | 4 ++--
make.sh | 4 ++--
37 files changed, 10 insertions(+), 13 deletions(-)
rename config/rootfiles/core/{104 => 105}/exclude (100%)
copy config/rootfiles/{oldcore/55 => core/105}/filelists/files (65%)
copy config/rootfiles/{oldcore/94 => core/105}/filelists/libgcrypt (100%)
copy config/rootfiles/{oldcore/99 => core/105}/filelists/openssl (100%)
rename config/rootfiles/core/{104 => 105}/meta (100%)
copy config/rootfiles/{oldcore/102 => core/105}/update.sh (99%)
copy config/rootfiles/oldcore/{103 => 104}/exclude (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/acl (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-kirkwood (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-multi (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-rpi (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/curl (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/ddns (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/dnsmasq (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/i586/acpid (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/i586/linux (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/iputils (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/libarchive (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/libcap (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/ntp (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/openssh (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/pcre (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/popt (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/screen (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/shadow (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/snort (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/wget (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/which (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/x86_64/acpid (100%)
rename config/rootfiles/{core => oldcore}/104/filelists/x86_64/linux (100%)
copy config/rootfiles/oldcore/{99 => 104}/meta (100%)
rename config/rootfiles/{core => oldcore}/104/update.sh (100%)
Difference in files:
diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt
index 578e0b6..4706343 100644
--- a/config/rootfiles/common/libgcrypt
+++ b/config/rootfiles/common/libgcrypt
@@ -6,7 +6,7 @@
#usr/lib/libgcrypt.la
#usr/lib/libgcrypt.so
usr/lib/libgcrypt.so.20
-usr/lib/libgcrypt.so.20.0.4
+usr/lib/libgcrypt.so.20.1.3
#usr/share/aclocal/libgcrypt.m4
#usr/share/info/gcrypt.info
#usr/share/man/man1/hmac256.1
diff --git a/config/rootfiles/core/104/exclude b/config/rootfiles/core/104/exclude
deleted file mode 100644
index 7ddeae0..0000000
--- a/config/rootfiles/core/104/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/104/filelists/acl b/config/rootfiles/core/104/filelists/acl
deleted file mode 120000
index d819f9c..0000000
--- a/config/rootfiles/core/104/filelists/acl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/acl
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood
deleted file mode 120000
index 7217107..0000000
--- a/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-multi b/config/rootfiles/core/104/filelists/armv5tel/linux-multi
deleted file mode 120000
index 204eb4c..0000000
--- a/config/rootfiles/core/104/filelists/armv5tel/linux-multi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-rpi b/config/rootfiles/core/104/filelists/armv5tel/linux-rpi
deleted file mode 120000
index a651a49..0000000
--- a/config/rootfiles/core/104/filelists/armv5tel/linux-rpi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/curl b/config/rootfiles/core/104/filelists/curl
deleted file mode 120000
index 4b84bef..0000000
--- a/config/rootfiles/core/104/filelists/curl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/curl
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/ddns b/config/rootfiles/core/104/filelists/ddns
deleted file mode 120000
index 7395164..0000000
--- a/config/rootfiles/core/104/filelists/ddns
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/dnsmasq b/config/rootfiles/core/104/filelists/dnsmasq
deleted file mode 120000
index d469c74..0000000
--- a/config/rootfiles/core/104/filelists/dnsmasq
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files
deleted file mode 100644
index c172c14..0000000
--- a/config/rootfiles/core/104/filelists/files
+++ /dev/null
@@ -1,14 +0,0 @@
-etc/system-release
-etc/issue
-etc/collectd.conf
-etc/httpd/conf/global.conf
-etc/rc.d/init.d/snort
-opt/pakfire/lib/functions.sh
-srv/web/ipfire/cgi-bin/ids.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-srv/web/ipfire/cgi-bin/logs.cgi/log.dat
-srv/web/ipfire/html/themes/ipfire/include/functions.pl
-srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
-var/ipfire/langs
-var/ipfire/fwhosts/customservices.default
-var/ipfire/updatexlrator/bin/download
diff --git a/config/rootfiles/core/104/filelists/i586/acpid b/config/rootfiles/core/104/filelists/i586/acpid
deleted file mode 120000
index 21d36ee..0000000
--- a/config/rootfiles/core/104/filelists/i586/acpid
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/acpid
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/i586/linux b/config/rootfiles/core/104/filelists/i586/linux
deleted file mode 120000
index 693ec4b..0000000
--- a/config/rootfiles/core/104/filelists/i586/linux
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/iputils b/config/rootfiles/core/104/filelists/iputils
deleted file mode 120000
index 361c28f..0000000
--- a/config/rootfiles/core/104/filelists/iputils
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/iputils
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/libarchive b/config/rootfiles/core/104/filelists/libarchive
deleted file mode 120000
index 551f1f7..0000000
--- a/config/rootfiles/core/104/filelists/libarchive
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libarchive
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/libcap b/config/rootfiles/core/104/filelists/libcap
deleted file mode 120000
index ed67d95..0000000
--- a/config/rootfiles/core/104/filelists/libcap
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libcap
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/ntp b/config/rootfiles/core/104/filelists/ntp
deleted file mode 120000
index 7542d86..0000000
--- a/config/rootfiles/core/104/filelists/ntp
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/openssh b/config/rootfiles/core/104/filelists/openssh
deleted file mode 120000
index d8c77fd..0000000
--- a/config/rootfiles/core/104/filelists/openssh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/pcre b/config/rootfiles/core/104/filelists/pcre
deleted file mode 120000
index b390d9a..0000000
--- a/config/rootfiles/core/104/filelists/pcre
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/pcre
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/popt b/config/rootfiles/core/104/filelists/popt
deleted file mode 120000
index d71a9ab..0000000
--- a/config/rootfiles/core/104/filelists/popt
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/popt
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/screen b/config/rootfiles/core/104/filelists/screen
deleted file mode 120000
index 81008f4..0000000
--- a/config/rootfiles/core/104/filelists/screen
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/screen
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/shadow b/config/rootfiles/core/104/filelists/shadow
deleted file mode 120000
index c0824b7..0000000
--- a/config/rootfiles/core/104/filelists/shadow
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/shadow
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/snort b/config/rootfiles/core/104/filelists/snort
deleted file mode 120000
index 9406ce0..0000000
--- a/config/rootfiles/core/104/filelists/snort
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/wget b/config/rootfiles/core/104/filelists/wget
deleted file mode 120000
index fcb57df..0000000
--- a/config/rootfiles/core/104/filelists/wget
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/wget
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/which b/config/rootfiles/core/104/filelists/which
deleted file mode 120000
index 9cfc884..0000000
--- a/config/rootfiles/core/104/filelists/which
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/which
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/x86_64/acpid b/config/rootfiles/core/104/filelists/x86_64/acpid
deleted file mode 120000
index 289f8f5..0000000
--- a/config/rootfiles/core/104/filelists/x86_64/acpid
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/acpid
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/x86_64/linux b/config/rootfiles/core/104/filelists/x86_64/linux
deleted file mode 120000
index 0615b5b..0000000
--- a/config/rootfiles/core/104/filelists/x86_64/linux
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/104/meta b/config/rootfiles/core/104/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/104/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh
deleted file mode 100644
index 0223923..0000000
--- a/config/rootfiles/core/104/update.sh
+++ /dev/null
@@ -1,254 +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
-
-function find_device() {
- local mountpoint="${1}"
-
- local root
- local dev mp fs flags rest
- while read -r dev mp fs flags rest; do
- # Skip unwanted entries
- [ "${dev}" = "rootfs" ] && continue
-
- if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then
- root="$(basename "${dev}")"
- break
- fi
- done < /proc/mounts
-
- # Get the actual device from the partition that holds /
- while [ -n "${root}" ]; do
- if [ -e "/sys/block/${root}" ]; then
- echo "${root}"
- return 0
- fi
-
- # Remove last character
- root="${root::-1}"
- done
-
- return 1
-}
-
-
-core=104
-
-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
-
-#
-# Do some sanity checks.
-case $(uname -r) in
- *-ipfire* )
- # Ok.
- ;;
- * )
- exit_with_error "ERROR cannot update. No IPFire Kernel." 1
- ;;
-esac
-
-
-#
-#
-KVER="xxxKVERxxx"
-
-# Check diskspace on root
-ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
-
-if [ $ROOTSPACE -lt 100000 ]; then
- exit_with_error "ERROR cannot update because not enough free space on root." 2
- exit 2
-fi
-
-echo
-echo Update Kernel to $KVER ...
-#
-# Remove old kernel, configs, initrd, modules, dtb's ...
-#
-rm -rf /boot/System.map-*
-rm -rf /boot/config-*
-rm -rf /boot/ipfirerd-*
-rm -rf /boot/initramfs-*
-rm -rf /boot/vmlinuz-*
-rm -rf /boot/uImage-ipfire-*
-rm -rf /boot/zImage-ipfire-*
-rm -rf /boot/uInit-ipfire-*
-rm -rf /boot/dtb-*-ipfire-*
-rm -rf /lib/modules
-
-case "$(uname -m)" in
- armv*)
- # Backup uEnv.txt if exist
- if [ -e /boot/uEnv.txt ]; then
- cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
- fi
-
- # work around the u-boot folder detection bug
- mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
- mkdir -pv /boot/dtb-$KVER-ipfire-multi
- touch /boot/uImage-ipfire-kirkwood
- touch /boot/zImage-ipfire-multi
- touch /boot/uIinit-ipfire-kirkwood
- touch /boot/uIinit-ipfire-multi
- ;;
-esac
-
-# Stop services
-/etc/init.d/collectd stop
-/etc/init.d/snort stop
-/etc/init.d/squid stop
-/etc/init.d/dnsmasq stop
-/etc/init.d/sshd stop
-/etc/init.d/ipsec stop
-/etc/init.d/apache stop
-
-# Extract files
-tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
-
-# Remove some old files
-rm -f /bin/groups /lib/libshadow.so.0*
-
-# update linker config
-ldconfig
-
-# Check diskspace on boot
-BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
-
-if [ $BOOTSPACE -lt 1000 ]; then
- case $(uname -r) in
- *-ipfire-kirkwood )
- # Special handling for old kirkwood images.
- # (install only kirkwood kernel)
- rm -rf /boot/*
- # work around the u-boot folder detection bug
- mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
- tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
- --numeric-owner -C / --wildcards 'boot/*-kirkwood*'
- ;;
- * )
- /etc/init.d/apache start
- exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4
- ;;
- esac
-fi
-
-# Update Language cache
-/usr/local/bin/update-lang-cache
-
-#
-# Start services
-#
-/etc/init.d/collectd start
-/etc/init.d/apache start
-/etc/init.d/dnsmasq start
-/etc/init.d/sshd start
-/etc/init.d/squid start
-/etc/init.d/snort start
-if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
- /etc/init.d/ipsec start
-fi
-
-# Delete old QoS enabled indicator
-rm -f /var/ipfire/qos/enable
-
-# Upadate Kernel version uEnv.txt
-if [ -e /boot/uEnv.txt ]; then
- sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
-fi
-
-# call user update script (needed for some arm boards)
-if [ -e /boot/pakfire-kernel-update ]; then
- /boot/pakfire-kernel-update ${KVER}
-fi
-
-case "$(uname -m)" in
- i?86)
- # Force (re)install pae kernel if pae is supported
- rm -rf /opt/pakfire/db/installed/meta-linux-pae
- if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
- ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
- BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
- if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
- /usr/bin/logger -p syslog.emerg -t ipfire \
- "core-update-${core}: WARNING not enough space for pae kernel."
- else
- echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
- echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
- echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
- fi
- fi
- ;;
-esac
-#
-# After pakfire has ended run it again and update the lists and do upgrade
-#
-echo '#!/bin/bash' > /tmp/pak_update
-echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
-echo ' sleep 1' >> /tmp/pak_update
-echo 'done' >> /tmp/pak_update
-echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
-echo ' sleep 1' >> /tmp/pak_update
-echo 'done' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
-echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
-#
-killall -KILL pak_update
-chmod +x /tmp/pak_update
-/tmp/pak_update &
-
-sync
-
-# 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/105/exclude b/config/rootfiles/core/105/exclude
new file mode 100644
index 0000000..7ddeae0
--- /dev/null
+++ b/config/rootfiles/core/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/core/105/filelists/files b/config/rootfiles/core/105/filelists/files
new file mode 100644
index 0000000..95f6e10
--- /dev/null
+++ b/config/rootfiles/core/105/filelists/files
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
\ No newline at end of file
diff --git a/config/rootfiles/core/105/filelists/libgcrypt b/config/rootfiles/core/105/filelists/libgcrypt
new file mode 120000
index 0000000..2df12a2
--- /dev/null
+++ b/config/rootfiles/core/105/filelists/libgcrypt
@@ -0,0 +1 @@
+../../../common/libgcrypt
\ No newline at end of file
diff --git a/config/rootfiles/core/105/filelists/openssl b/config/rootfiles/core/105/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/105/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/105/meta b/config/rootfiles/core/105/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/105/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/105/update.sh b/config/rootfiles/core/105/update.sh
new file mode 100644
index 0000000..3e9f601
--- /dev/null
+++ b/config/rootfiles/core/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/config/rootfiles/oldcore/104/exclude b/config/rootfiles/oldcore/104/exclude
new file mode 100644
index 0000000..7ddeae0
--- /dev/null
+++ b/config/rootfiles/oldcore/104/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/104/filelists/acl b/config/rootfiles/oldcore/104/filelists/acl
new file mode 120000
index 0000000..d819f9c
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/acl
@@ -0,0 +1 @@
+../../../common/acl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood
new file mode 120000
index 0000000..7217107
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi
new file mode 120000
index 0000000..204eb4c
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi
new file mode 120000
index 0000000..a651a49
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/curl b/config/rootfiles/oldcore/104/filelists/curl
new file mode 120000
index 0000000..4b84bef
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/curl
@@ -0,0 +1 @@
+../../../common/curl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/ddns b/config/rootfiles/oldcore/104/filelists/ddns
new file mode 120000
index 0000000..7395164
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/ddns
@@ -0,0 +1 @@
+../../../common/ddns
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/dnsmasq b/config/rootfiles/oldcore/104/filelists/dnsmasq
new file mode 120000
index 0000000..d469c74
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/dnsmasq
@@ -0,0 +1 @@
+../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/files b/config/rootfiles/oldcore/104/filelists/files
new file mode 100644
index 0000000..c172c14
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/files
@@ -0,0 +1,14 @@
+etc/system-release
+etc/issue
+etc/collectd.conf
+etc/httpd/conf/global.conf
+etc/rc.d/init.d/snort
+opt/pakfire/lib/functions.sh
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/html/themes/ipfire/include/functions.pl
+srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
+var/ipfire/langs
+var/ipfire/fwhosts/customservices.default
+var/ipfire/updatexlrator/bin/download
diff --git a/config/rootfiles/oldcore/104/filelists/i586/acpid b/config/rootfiles/oldcore/104/filelists/i586/acpid
new file mode 120000
index 0000000..21d36ee
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/i586/acpid
@@ -0,0 +1 @@
+../../../../common/i586/acpid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/i586/linux b/config/rootfiles/oldcore/104/filelists/i586/linux
new file mode 120000
index 0000000..693ec4b
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/iputils b/config/rootfiles/oldcore/104/filelists/iputils
new file mode 120000
index 0000000..361c28f
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/iputils
@@ -0,0 +1 @@
+../../../common/iputils
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/libarchive b/config/rootfiles/oldcore/104/filelists/libarchive
new file mode 120000
index 0000000..551f1f7
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/libarchive
@@ -0,0 +1 @@
+../../../common/libarchive
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/libcap b/config/rootfiles/oldcore/104/filelists/libcap
new file mode 120000
index 0000000..ed67d95
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/libcap
@@ -0,0 +1 @@
+../../../common/libcap
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/ntp b/config/rootfiles/oldcore/104/filelists/ntp
new file mode 120000
index 0000000..7542d86
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/ntp
@@ -0,0 +1 @@
+../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/openssh b/config/rootfiles/oldcore/104/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/pcre b/config/rootfiles/oldcore/104/filelists/pcre
new file mode 120000
index 0000000..b390d9a
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/pcre
@@ -0,0 +1 @@
+../../../common/pcre
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/popt b/config/rootfiles/oldcore/104/filelists/popt
new file mode 120000
index 0000000..d71a9ab
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/popt
@@ -0,0 +1 @@
+../../../common/popt
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/screen b/config/rootfiles/oldcore/104/filelists/screen
new file mode 120000
index 0000000..81008f4
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/screen
@@ -0,0 +1 @@
+../../../common/screen
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/shadow b/config/rootfiles/oldcore/104/filelists/shadow
new file mode 120000
index 0000000..c0824b7
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/shadow
@@ -0,0 +1 @@
+../../../common/shadow
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/snort b/config/rootfiles/oldcore/104/filelists/snort
new file mode 120000
index 0000000..9406ce0
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/snort
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/wget b/config/rootfiles/oldcore/104/filelists/wget
new file mode 120000
index 0000000..fcb57df
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/which b/config/rootfiles/oldcore/104/filelists/which
new file mode 120000
index 0000000..9cfc884
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/which
@@ -0,0 +1 @@
+../../../common/which
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/x86_64/acpid b/config/rootfiles/oldcore/104/filelists/x86_64/acpid
new file mode 120000
index 0000000..289f8f5
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/x86_64/acpid
@@ -0,0 +1 @@
+../../../../common/x86_64/acpid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/filelists/x86_64/linux b/config/rootfiles/oldcore/104/filelists/x86_64/linux
new file mode 120000
index 0000000..0615b5b
--- /dev/null
+++ b/config/rootfiles/oldcore/104/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/104/meta b/config/rootfiles/oldcore/104/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/104/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/104/update.sh b/config/rootfiles/oldcore/104/update.sh
new file mode 100644
index 0000000..0223923
--- /dev/null
+++ b/config/rootfiles/oldcore/104/update.sh
@@ -0,0 +1,254 @@
+#!/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
+
+function find_device() {
+ local mountpoint="${1}"
+
+ local root
+ local dev mp fs flags rest
+ while read -r dev mp fs flags rest; do
+ # Skip unwanted entries
+ [ "${dev}" = "rootfs" ] && continue
+
+ if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then
+ root="$(basename "${dev}")"
+ break
+ fi
+ done < /proc/mounts
+
+ # Get the actual device from the partition that holds /
+ while [ -n "${root}" ]; do
+ if [ -e "/sys/block/${root}" ]; then
+ echo "${root}"
+ return 0
+ fi
+
+ # Remove last character
+ root="${root::-1}"
+ done
+
+ return 1
+}
+
+
+core=104
+
+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
+
+#
+# Do some sanity checks.
+case $(uname -r) in
+ *-ipfire* )
+ # Ok.
+ ;;
+ * )
+ exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+ ;;
+esac
+
+
+#
+#
+KVER="xxxKVERxxx"
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+ exit_with_error "ERROR cannot update because not enough free space on root." 2
+ exit 2
+fi
+
+echo
+echo Update Kernel to $KVER ...
+#
+# Remove old kernel, configs, initrd, modules, dtb's ...
+#
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-ipfire-*
+rm -rf /boot/zImage-ipfire-*
+rm -rf /boot/uInit-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+
+case "$(uname -m)" in
+ armv*)
+ # Backup uEnv.txt if exist
+ if [ -e /boot/uEnv.txt ]; then
+ cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+ fi
+
+ # work around the u-boot folder detection bug
+ mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
+ mkdir -pv /boot/dtb-$KVER-ipfire-multi
+ touch /boot/uImage-ipfire-kirkwood
+ touch /boot/zImage-ipfire-multi
+ touch /boot/uIinit-ipfire-kirkwood
+ touch /boot/uIinit-ipfire-multi
+ ;;
+esac
+
+# Stop services
+/etc/init.d/collectd stop
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+/etc/init.d/dnsmasq stop
+/etc/init.d/sshd stop
+/etc/init.d/ipsec stop
+/etc/init.d/apache stop
+
+# Extract files
+tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
+
+# Remove some old files
+rm -f /bin/groups /lib/libshadow.so.0*
+
+# update linker config
+ldconfig
+
+# Check diskspace on boot
+BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $BOOTSPACE -lt 1000 ]; then
+ case $(uname -r) in
+ *-ipfire-kirkwood )
+ # Special handling for old kirkwood images.
+ # (install only kirkwood kernel)
+ rm -rf /boot/*
+ # work around the u-boot folder detection bug
+ mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
+ tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
+ --numeric-owner -C / --wildcards 'boot/*-kirkwood*'
+ ;;
+ * )
+ /etc/init.d/apache start
+ exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4
+ ;;
+ esac
+fi
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+#
+# Start services
+#
+/etc/init.d/collectd start
+/etc/init.d/apache start
+/etc/init.d/dnsmasq start
+/etc/init.d/sshd start
+/etc/init.d/squid start
+/etc/init.d/snort start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+# Delete old QoS enabled indicator
+rm -f /var/ipfire/qos/enable
+
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+ sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+ /boot/pakfire-kernel-update ${KVER}
+fi
+
+case "$(uname -m)" in
+ i?86)
+ # Force (re)install pae kernel if pae is supported
+ rm -rf /opt/pakfire/db/installed/meta-linux-pae
+ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+ ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: WARNING not enough space for pae kernel."
+ else
+ echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+ echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ fi
+ fi
+ ;;
+esac
+#
+# After pakfire has ended run it again and update the lists and do upgrade
+#
+echo '#!/bin/bash' > /tmp/pak_update
+echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
+echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
+#
+killall -KILL pak_update
+chmod +x /tmp/pak_update
+/tmp/pak_update &
+
+sync
+
+# 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/lfs/libgcrypt b/lfs/libgcrypt
index 98cf787..5a06032 100644
--- a/lfs/libgcrypt
+++ b/lfs/libgcrypt
@@ -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,7 +24,7 @@
include Config
-VER = 1.6.4
+VER = 1.7.3
THISAPP = libgcrypt-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4c13c5fa43147866f993d73ee62af176
+$(DL_FILE)_MD5 = c869e542cc13a1c28d8055487bf7f5c4
install : $(TARGET)
diff --git a/lfs/openssl b/lfs/openssl
index 0a0b2cf..d0ed4d3 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
include Config
-VER = 1.0.2h
+VER = 1.0.2i
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -87,7 +87,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9392e65072ce4b614c1392eefc1f23d0
+$(DL_FILE)_MD5 = 678374e63f8df456a697d3e5e5a931fb
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 1c832d0..b6cb506 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.19" # Version number
-CORE="104" # Core Level (Filename)
-PAKFIRE_CORE="104" # Core Level (PAKFIRE)
+CORE="105" # 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
CONFIG_ROOT=/var/ipfire # Configuration rootdir
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, core105, updated. cd805ced09c2e203e7e6b874b7b96fb5e86a11b5
by gitï¼ ipfire.org 22 Sep '16
by gitï¼ ipfire.org 22 Sep '16
22 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, core105 has been updated
via cd805ced09c2e203e7e6b874b7b96fb5e86a11b5 (commit)
via 3bc177eec53248b296e13654003f278c65ddc413 (commit)
from 8bbed7a5b6a878dae03d605042b48304f3900304 (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 cd805ced09c2e203e7e6b874b7b96fb5e86a11b5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 22 12:04:18 2016 +0100
Tag Core Update 105
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3bc177eec53248b296e13654003f278c65ddc413
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 22 12:02:32 2016 +0100
openssl: Update to 1.0.2i
https://www.openssl.org/news/openssl-1.0.2-notes.html
This release fixes various security flaws:
* OCSP Status Request extension unbounded memory growth (CVE-2016-6304)
* SWEET32 Mitigation (CVE-2016-2183)
* OOB write in MDC2_Update() (CVE-2016-6303)
* Malformed SHA512 ticket DoS (CVE-2016-6302)
* OOB write in BN_bn2dec() (CVE-2016-2182)
* OOB read in TS_OBJ_print_bio() (CVE-2016-2180)
* Pointer arithmetic undefined behaviour (CVE-2016-2177)
* Constant time flag not preserved in DSA signing (CVE-2016-2178)
* DTLS buffered message DoS (CVE-2016-2179)
* DTLS replay protection DoS (CVE-2016-2181)
* Certificate message OOB reads (CVE-2016-6306)
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/{oldcore/99 => core/105}/filelists/openssl | 0
lfs/openssl | 4 ++--
make.sh | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
copy config/rootfiles/{oldcore/99 => core/105}/filelists/openssl (100%)
Difference in files:
diff --git a/config/rootfiles/core/105/filelists/openssl b/config/rootfiles/core/105/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/105/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/lfs/openssl b/lfs/openssl
index 0a0b2cf..d0ed4d3 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
include Config
-VER = 1.0.2h
+VER = 1.0.2i
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -87,7 +87,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9392e65072ce4b614c1392eefc1f23d0
+$(DL_FILE)_MD5 = 678374e63f8df456a697d3e5e5a931fb
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 1c832d0..b6cb506 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.19" # Version number
-CORE="104" # Core Level (Filename)
-PAKFIRE_CORE="104" # Core Level (PAKFIRE)
+CORE="105" # 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
CONFIG_ROOT=/var/ipfire # Configuration rootdir
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, core105, created. 8bbed7a5b6a878dae03d605042b48304f3900304
by gitï¼ ipfire.org 22 Sep '16
by gitï¼ ipfire.org 22 Sep '16
22 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, core105 has been created
at 8bbed7a5b6a878dae03d605042b48304f3900304 (commit)
- Log -----------------------------------------------------------------
commit 8bbed7a5b6a878dae03d605042b48304f3900304
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 22 10:30:28 2016 +0100
core105: Ship security update for libgcrypt
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit db7ef87902096d8268bb348ba5821eba344e27ba
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Aug 20 12:33:55 2016 +0200
libgcrypt: Update to 1.7.3
Fixes CVE-2016-6313
For details, see:
https://lists.gnupg.org/pipermail/gnupg-announce/2016q3/000395.html
https://bugzilla.redhat.com/show_bug.cgi?id=1366105
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c4a1169ed975c15ee8c29c99d0667388a09c29bf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Sep 22 10:28:36 2016 +0100
Start Core Update 105
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 7937617827db1f328101edf8a57ec749510e6296
by gitï¼ ipfire.org 19 Sep '16
by gitï¼ ipfire.org 19 Sep '16
19 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 7937617827db1f328101edf8a57ec749510e6296 (commit)
via 5f48ddf4d7c5e7210f0a374c5c9b8aee7b36c809 (commit)
via 740467c73031979256e470e3c8a93e78ad2a7593 (commit)
from 0d0c4226c9bc31a9c731d3769d321b343c41ac8b (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 7937617827db1f328101edf8a57ec749510e6296
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Sep 19 12:23:39 2016 +0000
unicode-ucd: Update to Version 9.0.0
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5f48ddf4d7c5e7210f0a374c5c9b8aee7b36c809
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Sep 19 12:19:28 2016 +0000
unbound: Update to 1.5.9
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 740467c73031979256e470e3c8a93e78ad2a7593
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Sep 19 11:58:46 2016 +0000
tzdata: Update to 2016f
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
tzdata/tzdata.nm | 4 ++--
unbound/unbound.nm | 2 +-
unicode-ucd/unicode-ucd.nm | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
Difference in files:
diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index 4f2ed96..dfff383 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -3,8 +3,8 @@
# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
###############################################################################
-tzdata_version = 2016d
-tzcode_version = 2016d
+tzdata_version = 2016f
+tzcode_version = 2016f
name = tzdata
version = %{tzdata_version}
diff --git a/unbound/unbound.nm b/unbound/unbound.nm
index c8a0d09..dff6465 100644
--- a/unbound/unbound.nm
+++ b/unbound/unbound.nm
@@ -4,7 +4,7 @@
###############################################################################
name = unbound
-version = 1.5.5
+version = 1.5.9
release = 1
groups = System/Daemons
diff --git a/unicode-ucd/unicode-ucd.nm b/unicode-ucd/unicode-ucd.nm
index 520edec..17e922d 100644
--- a/unicode-ucd/unicode-ucd.nm
+++ b/unicode-ucd/unicode-ucd.nm
@@ -4,7 +4,7 @@
###############################################################################
name = unicode-ucd
-version = 6.1.0
+version = 9.0.0
release = 1
arch = noarch
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0d0c4226c9bc31a9c731d3769d321b343c41ac8b
by gitï¼ ipfire.org 19 Sep '16
by gitï¼ ipfire.org 19 Sep '16
19 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 0d0c4226c9bc31a9c731d3769d321b343c41ac8b (commit)
via f4587ad056d4b5241f7035e8b76b16689a699cc5 (commit)
via 11676d9f76329396aa36003469fa98478cc74399 (commit)
from 5caf3364f5d9c3faa2a461749dd815166cb8bd4c (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 0d0c4226c9bc31a9c731d3769d321b343c41ac8b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 19 13:49:10 2016 +0100
binutils: Update to 2.27
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f4587ad056d4b5241f7035e8b76b16689a699cc5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Sep 18 14:57:39 2016 +0100
bash: Update to 4.4
This drops most of the patches and uses CPPFLAGS instead.
bash is now using libreadline from the system and not
shipping an own version any more.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 11676d9f76329396aa36003469fa98478cc74399
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Sep 18 11:05:31 2016 +0100
readline: Update to 7.0
Requires shipping a compat package for libreadline 6.x
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
bash/bash.nm | 33 +++-
bash/patches/bash-2.02-security.patch | 11 --
bash/patches/bash-2.03-paths.patch | 11 --
bash/patches/bash-2.03-profile.patch | 12 --
bash/patches/bash-2.05a-interpreter.patch | 219 ---------------------
bash/patches/bash-2.05b-manso.patch | 10 -
bash/patches/bash-2.05b-pgrp_sync.patch | 11 --
bash/patches/bash-2.05b-readline-oom.patch | 11 --
bash/patches/bash-3.2-ssh_source_bash.patch | 12 --
bash/patches/bash-4.0-nobits.patch | 154 ---------------
bash/patches/bash-4.1-broken_pipe.patch | 12 --
bash/patches/bash-4.1-defer-sigchld-trap.patch | 11 --
bash/patches/bash-4.1-examples.patch | 24 ---
bash/patches/bash-4.2-coverity.patch | 99 ----------
bash/patches/bash-4.2-manpage_trap.patch | 12 --
bash/patches/bash-4.2-rc2-logout.patch | 36 ----
bash/patches/bash-4.2-size_type.patch | 14 --
bash/patches/bash-4.3-here-doc-ps2-comsub.patch0 | 47 -----
.../bash-4.3-lastpipe-nested-pipe-segfault.patch0 | 24 ---
bash/patches/bash-4.3-man-ulimit.patch | 24 ---
bash/patches/bash-4.3-parse-time-keyword.patch0 | 28 ---
.../bash-4.3-pathexp-globignore-delim.patch0 | 15 --
bash/patches/bash-4.3-readline-revert-lines.patch0 | 18 --
bash/patches/bash-bashbug.patch | 56 ------
bash/patches/bash-infotags.patch | 30 ---
bash/patches/bash-requires.patch | 149 ++++++++------
bash/patches/bash43-001 | 58 ------
bash/patches/bash43-002 | 62 ------
bash/patches/bash43-003 | 48 -----
bash/patches/bash43-004 | 47 -----
bash/patches/bash43-005 | 63 ------
bash/patches/bash43-006 | 48 -----
bash/patches/bash43-007 | 50 -----
bash/patches/bash43-008 | 188 ------------------
bash/patches/bash43-009 | 64 ------
bash/patches/bash43-010 | 157 ---------------
bash/patches/bash43-011 | 49 -----
bash/patches/bash43-012 | 43 ----
bash/patches/bash43-013 | 66 -------
bash/patches/bash43-014 | 102 ----------
bash/patches/bash43-015 | 58 ------
bash/patches/bash43-016 | 132 -------------
bash/patches/bash43-017 | 51 -----
bash/patches/bash43-018 | 44 -----
bash/patches/bash43-019 | 84 --------
bash/patches/bash43-020 | 110 -----------
bash/patches/bash43-021 | 52 -----
bash/patches/bash43-022 | 56 ------
bash/patches/bash43-023 | 104 ----------
bash/patches/bash43-024 | 54 -----
bash/patches/bash43-025 | 123 ------------
bash/patches/bash43-026 | 60 ------
binutils/binutils.nm | 2 +-
.../binutils-2.22.52.0.1-relro-on-by-default.patch | 58 ------
binutils/patches/binutils-2.24-use-relro.patch | 9 -
.../binutils-2.26-fix-GOT-offset-calculation.patch | 17 --
binutils/patches/binutils-2.26-lto.patch | 159 +++++++--------
.../binutils-2.26-x86-PIE-relocations.patch | 46 -----
.../binutils-2.27-arm-aarch64-default-relro.patch | 20 ++
.../binutils-2.27-relro-on-by-default.patch | 13 ++
binutils/patches/binutils-rh1312151.patch | 22 ---
.../compat-readline.nm | 32 ++-
.../patches/readline-5.0-no_rpath.patch | 13 ++
readline/patches/readline-5.0-no_rpath.patch | 13 ++
readline/readline.nm | 3 +-
65 files changed, 271 insertions(+), 3192 deletions(-)
delete mode 100644 bash/patches/bash-2.02-security.patch
delete mode 100644 bash/patches/bash-2.03-paths.patch
delete mode 100644 bash/patches/bash-2.03-profile.patch
delete mode 100644 bash/patches/bash-2.05a-interpreter.patch
delete mode 100644 bash/patches/bash-2.05b-manso.patch
delete mode 100644 bash/patches/bash-2.05b-pgrp_sync.patch
delete mode 100644 bash/patches/bash-2.05b-readline-oom.patch
delete mode 100644 bash/patches/bash-3.2-ssh_source_bash.patch
delete mode 100644 bash/patches/bash-4.0-nobits.patch
delete mode 100644 bash/patches/bash-4.1-broken_pipe.patch
delete mode 100644 bash/patches/bash-4.1-defer-sigchld-trap.patch
delete mode 100644 bash/patches/bash-4.1-examples.patch
delete mode 100644 bash/patches/bash-4.2-coverity.patch
delete mode 100644 bash/patches/bash-4.2-manpage_trap.patch
delete mode 100644 bash/patches/bash-4.2-rc2-logout.patch
delete mode 100644 bash/patches/bash-4.2-size_type.patch
delete mode 100644 bash/patches/bash-4.3-here-doc-ps2-comsub.patch0
delete mode 100644 bash/patches/bash-4.3-lastpipe-nested-pipe-segfault.patch0
delete mode 100644 bash/patches/bash-4.3-man-ulimit.patch
delete mode 100644 bash/patches/bash-4.3-parse-time-keyword.patch0
delete mode 100644 bash/patches/bash-4.3-pathexp-globignore-delim.patch0
delete mode 100644 bash/patches/bash-4.3-readline-revert-lines.patch0
delete mode 100644 bash/patches/bash-bashbug.patch
delete mode 100644 bash/patches/bash-infotags.patch
delete mode 100644 bash/patches/bash43-001
delete mode 100644 bash/patches/bash43-002
delete mode 100644 bash/patches/bash43-003
delete mode 100644 bash/patches/bash43-004
delete mode 100644 bash/patches/bash43-005
delete mode 100644 bash/patches/bash43-006
delete mode 100644 bash/patches/bash43-007
delete mode 100644 bash/patches/bash43-008
delete mode 100644 bash/patches/bash43-009
delete mode 100644 bash/patches/bash43-010
delete mode 100644 bash/patches/bash43-011
delete mode 100644 bash/patches/bash43-012
delete mode 100644 bash/patches/bash43-013
delete mode 100644 bash/patches/bash43-014
delete mode 100644 bash/patches/bash43-015
delete mode 100644 bash/patches/bash43-016
delete mode 100644 bash/patches/bash43-017
delete mode 100644 bash/patches/bash43-018
delete mode 100644 bash/patches/bash43-019
delete mode 100644 bash/patches/bash43-020
delete mode 100644 bash/patches/bash43-021
delete mode 100644 bash/patches/bash43-022
delete mode 100644 bash/patches/bash43-023
delete mode 100644 bash/patches/bash43-024
delete mode 100644 bash/patches/bash43-025
delete mode 100644 bash/patches/bash43-026
delete mode 100644 binutils/patches/binutils-2.22.52.0.1-relro-on-by-default.patch
delete mode 100644 binutils/patches/binutils-2.24-use-relro.patch
delete mode 100644 binutils/patches/binutils-2.26-fix-GOT-offset-calculation.patch
delete mode 100644 binutils/patches/binutils-2.26-x86-PIE-relocations.patch
create mode 100644 binutils/patches/binutils-2.27-arm-aarch64-default-relro.patch
create mode 100644 binutils/patches/binutils-2.27-relro-on-by-default.patch
delete mode 100644 binutils/patches/binutils-rh1312151.patch
copy readline/readline.nm => compat-readline/compat-readline.nm (65%)
create mode 100644 compat-readline/patches/readline-5.0-no_rpath.patch
create mode 100644 readline/patches/readline-5.0-no_rpath.patch
Difference in files:
diff --git a/bash/bash.nm b/bash/bash.nm
index 9894794..0ca9d15 100644
--- a/bash/bash.nm
+++ b/bash/bash.nm
@@ -4,8 +4,8 @@
###############################################################################
name = bash
-version = 4.3
-release = 11
+version = 4.4
+release = 1
groups = System/Tools
url = http://www.gnu.org/software/bash/
@@ -28,29 +28,42 @@ build
bison
filesystem >= 002
ncurses-devel
+ readline-devel >= 7.0
texinfo
end
+ # Disable parallel build
+ MAKETUNING =
+
prepare_cmds
# Bash uses the RTLD_LAZY option when loading libraries. We want to use
# RTLD_NOW (it is defined from <dlfcn.h>:
sed -e "s/filename, RTLD_LAZY/filename, RTLD_NOW/" \
-i builtins/enable.def
-
- sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/%{thisapp}|" \
- Makefile.in
end
- configure_options += \
- --with-afs \
- --with-bash-malloc=no
+ CPPFLAGS += -D_GNU_SOURCE %(getconf LFS_CFLAGS)
+
+ CPPFLAGS += -DNON_INTERACTIVE_LOGIN_SHELLS
+ CPPFLAGS += -DSSH_SOURCE_BASHRC
# Recycles pids is neccessary. When bash's last fork's pid was X
# and new fork's pid is also X, bash has to wait for this same pid.
# Without Recycles pids bash will not wait.
- make_build_targets += "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' $(getconf LFS_CFLAGS)"
+ CPPFLAGS += -DRECYCLES_PIDS
+
+ CPPFLAGS += \
+ -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' \
+ -DSTANDARD_UTILS_PATH='\"/bin:/usr/bin:/sbin:/usr/sbin\"' \
+ -DSYS_BASH_LOGOUT='\"/etc/bash.bash_logout\"'
+
+ configure_options += \
+ --with-installed-readline \
+ --with-afs \
+ --with-bash-malloc=no
+
+ make_build_targets += CPPFLAGS="%{CPPFLAGS}"
- # Test hangs forever
test
make tests
end
diff --git a/bash/patches/bash-2.02-security.patch b/bash/patches/bash-2.02-security.patch
deleted file mode 100644
index f8a913b..0000000
--- a/bash/patches/bash-2.02-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bash-2.02-orig/parse.y Wed Mar 25 18:16:23 1998
-+++ bash-2.02/parse.y Sun Apr 19 16:46:34 1998
-@@ -923,7 +923,7 @@
-
- #if defined (READLINE)
- char *current_readline_prompt = (char *)NULL;
--char *current_readline_line = (char *)NULL;
-+unsigned char *current_readline_line = (unsigned char *)NULL;
- int current_readline_line_index = 0;
-
- static int
diff --git a/bash/patches/bash-2.03-paths.patch b/bash/patches/bash-2.03-paths.patch
deleted file mode 100644
index 24ec5cc..0000000
--- a/bash/patches/bash-2.03-paths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bash-3.0/config-top.h.paths 2003-08-05 15:36:12.000000000 +0100
-+++ bash-3.0/config-top.h 2004-07-28 09:36:27.117205637 +0100
-@@ -66,7 +66,7 @@
- the Posix.2 confstr () function, or CS_PATH define are not present. */
- #ifndef STANDARD_UTILS_PATH
- #define STANDARD_UTILS_PATH \
-- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
-+ "/bin:/usr/bin:/usr/sbin:/sbin"
- #endif
-
- /* Default primary and secondary prompt strings. */
diff --git a/bash/patches/bash-2.03-profile.patch b/bash/patches/bash-2.03-profile.patch
deleted file mode 100644
index ba3344b..0000000
--- a/bash/patches/bash-2.03-profile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up bash-3.2/config-top.h.profile bash-3.2/config-top.h
---- bash-3.2/config-top.h.profile 2008-07-17 13:35:39.000000000 +0200
-+++ bash-3.2/config-top.h 2008-07-17 13:42:18.000000000 +0200
-@@ -26,6 +26,8 @@
- what POSIX.2 specifies. */
- #define CONTINUE_AFTER_KILL_ERROR
-
-+#define NON_INTERACTIVE_LOGIN_SHELLS
-+
- /* Define BREAK_COMPLAINS if you want the non-standard, but useful
- error messages about `break' and `continue' out of context. */
- #define BREAK_COMPLAINS
diff --git a/bash/patches/bash-2.05a-interpreter.patch b/bash/patches/bash-2.05a-interpreter.patch
deleted file mode 100644
index b9f0da2..0000000
--- a/bash/patches/bash-2.05a-interpreter.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff -up bash-4.2-rc2/config.h.in.interpreter bash-4.2-rc2/config.h.in
---- bash-4.2-rc2/config.h.in.interpreter 2011-02-09 07:59:21.000000000 +0100
-+++ bash-4.2-rc2/config.h.in 2011-02-09 07:59:21.000000000 +0100
-@@ -706,6 +706,9 @@
- /* Define if you have the pathconf function. */
- #undef HAVE_PATHCONF
-
-+/* Define if you have the pread function. */
-+#undef HAVE_PREAD
-+
- /* Define if you have the putenv function. */
- #undef HAVE_PUTENV
-
-@@ -898,6 +901,9 @@
- /* Define if you have the <dlfcn.h> header file. */
- #undef HAVE_DLFCN_H
-
-+/* Define if you have the <elf.h> header file. */
-+#undef HAVE_ELF_H
-+
- /* Define if you have the <grp.h> header file. */
- #undef HAVE_GRP_H
-
-diff -up bash-4.2-rc2/configure.in.interpreter bash-4.2-rc2/configure.in
---- bash-4.2-rc2/configure.in.interpreter 2011-01-16 21:31:12.000000000 +0100
-+++ bash-4.2-rc2/configure.ac 2011-02-09 08:02:27.000000000 +0100
-@@ -659,7 +659,7 @@ BASH_HEADER_INTTYPES
- AC_CHECK_HEADERS(unistd.h stdlib.h stdarg.h varargs.h limits.h string.h \
- memory.h locale.h termcap.h termio.h termios.h dlfcn.h \
- stdbool.h stddef.h stdint.h netdb.h pwd.h grp.h strings.h \
-- regex.h syslog.h ulimit.h)
-+ regex.h syslog.h ulimit.h elf.h)
- AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h \
- sys/resource.h sys/param.h sys/socket.h sys/stat.h \
- sys/time.h sys/times.h sys/types.h sys/wait.h)
-@@ -723,7 +723,7 @@ dnl checks for system calls
- AC_CHECK_FUNCS(dup2 eaccess fcntl getdtablesize getgroups gethostname \
- getpagesize getpeername getrlimit getrusage gettimeofday \
- kill killpg lstat readlink sbrk select setdtablesize \
-- setitimer tcgetpgrp uname ulimit waitpid)
-+ setitimer tcgetpgrp uname ulimit waitpid pread)
- AC_REPLACE_FUNCS(rename)
-
- dnl checks for c library functions
-diff -up bash-4.2-rc2/execute_cmd.c.interpreter bash-4.2-rc2/execute_cmd.c
---- bash-4.2-rc2/execute_cmd.c.interpreter 2011-01-20 04:24:47.000000000 +0100
-+++ bash-4.2-rc2/execute_cmd.c 2011-02-09 07:59:21.000000000 +0100
-@@ -41,6 +41,10 @@
- # include <unistd.h>
- #endif
-
-+#ifdef HAVE_ELF_H
-+# include <elf.h>
-+#endif
-+
- #include "posixtime.h"
-
- #if defined (HAVE_SYS_RESOURCE_H) && !defined (RLIMTYPE)
-@@ -4975,14 +4979,22 @@ shell_execve (command, args, env)
- {
- /* The file has the execute bits set, but the kernel refuses to
- run it for some reason. See why. */
-+#if defined (HAVE_HASH_BANG_EXEC) || defined (HAVE_ELF_H)
-+ int fd = open (command, O_RDONLY);
-+
-+ if (fd >= 0)
-+ sample_len = read (fd, sample, sizeof (sample));
-+ else
-+ sample_len = -1;
-+#endif
- #if defined (HAVE_HASH_BANG_EXEC)
-- READ_SAMPLE_BUF (command, sample, sample_len);
- sample[sample_len - 1] = '\0';
- if (sample_len > 2 && sample[0] == '#' && sample[1] == '!')
- {
- char *interp;
- int ilen;
-
-+ close (fd);
- interp = getinterp (sample, sample_len, (int *)NULL);
- ilen = strlen (interp);
- errno = i;
-@@ -4997,6 +5009,136 @@ shell_execve (command, args, env)
- return (EX_NOEXEC);
- }
- #endif
-+#if defined (HAVE_ELF_H)
-+ if (i == ENOENT
-+ && sample_len > EI_NIDENT
-+ && memcmp (sample, ELFMAG, SELFMAG) == 0)
-+ {
-+ off_t offset = -1;
-+
-+ /* It is an ELF file. Now determine whether it is dynamically
-+ linked and if yes, get the offset of the interpreter
-+ string. */
-+ if (sample[EI_CLASS] == ELFCLASS32
-+ && sample_len > sizeof (Elf32_Ehdr))
-+ {
-+ Elf32_Ehdr ehdr;
-+ Elf32_Phdr *phdr;
-+ int nphdr;
-+
-+ /* We have to copy the data since the sample buffer
-+ might not be aligned correctly to be accessed as
-+ an Elf32_Ehdr struct. */
-+ memcpy (&ehdr, sample, sizeof (Elf32_Ehdr));
-+
-+ nphdr = ehdr.e_phnum;
-+ phdr = (Elf32_Phdr *) malloc (nphdr * ehdr.e_phentsize);
-+ if (phdr != NULL)
-+ {
-+#ifdef HAVE_PREAD
-+ sample_len = pread (fd, phdr, nphdr * ehdr.e_phentsize,
-+ ehdr.e_phoff);
-+#else
-+ if (lseek (fd, ehdr.e_phoff, SEEK_SET) != -1)
-+ sample_len = read (fd, phdr,
-+ nphdr * ehdr.e_phentsize);
-+ else
-+ sample_len = -1;
-+#endif
-+ if (sample_len == nphdr * ehdr.e_phentsize)
-+ while (nphdr-- > 0)
-+ if (phdr[nphdr].p_type == PT_INTERP)
-+ {
-+ offset = phdr[nphdr].p_offset;
-+ break;
-+ }
-+ free (phdr);
-+ }
-+ }
-+ else if (sample[EI_CLASS] == ELFCLASS64
-+ && sample_len > sizeof (Elf64_Ehdr))
-+ {
-+ Elf64_Ehdr ehdr;
-+ Elf64_Phdr *phdr;
-+ int nphdr;
-+
-+ /* We have to copy the data since the sample buffer
-+ might not be aligned correctly to be accessed as
-+ an Elf64_Ehdr struct. */
-+ memcpy (&ehdr, sample, sizeof (Elf64_Ehdr));
-+
-+ nphdr = ehdr.e_phnum;
-+ phdr = (Elf64_Phdr *) malloc (nphdr * ehdr.e_phentsize);
-+ if (phdr != NULL)
-+ {
-+#ifdef HAVE_PREAD
-+ sample_len = pread (fd, phdr, nphdr * ehdr.e_phentsize,
-+ ehdr.e_phoff);
-+#else
-+ if (lseek (fd, ehdr.e_phoff, SEEK_SET) != -1)
-+ sample_len = read (fd, phdr,
-+ nphdr * ehdr.e_phentsize);
-+ else
-+ sample_len = -1;
-+#endif
-+ if (sample_len == nphdr * ehdr.e_phentsize)
-+ while (nphdr-- > 0)
-+ if (phdr[nphdr].p_type == PT_INTERP)
-+ {
-+ offset = phdr[nphdr].p_offset;
-+ break;
-+ }
-+ free (phdr);
-+ }
-+ }
-+
-+ if (offset != -1)
-+ {
-+ size_t maxlen = 0;
-+ size_t actlen = 0;
-+ char *interp = NULL;
-+
-+ do
-+ {
-+ if (actlen == maxlen)
-+ {
-+ char *newinterp = realloc (interp, maxlen += 200);
-+ if (newinterp == NULL)
-+ {
-+ actlen = 0;
-+ break;
-+ }
-+ interp = newinterp;
-+
-+#ifdef HAVE_PREAD
-+ actlen = pread (fd, interp, maxlen, offset);
-+#else
-+ if (lseek (fd, offset, SEEK_SET) != -1)
-+ actlen = read (fd, interp, maxlen);
-+ else
-+ actlen = -1;
-+#endif
-+ }
-+ }
-+ while (actlen > 0 && memchr (interp, '\0', actlen) == NULL);
-+
-+ if (actlen > 0)
-+ {
-+ close (fd);
-+ errno = i;
-+ sys_error ("%s: %s: bad ELF interpreter", command,
-+ interp);
-+ free (interp);
-+ return (EX_NOEXEC);
-+ }
-+
-+ free (interp);
-+ }
-+ }
-+#endif
-+#if defined (HAVE_HASH_BANG_EXEC) || defined (HAVE_ELF_H)
-+ close (fd);
-+#endif
- errno = i;
- file_error (command);
- }
diff --git a/bash/patches/bash-2.05b-manso.patch b/bash/patches/bash-2.05b-manso.patch
deleted file mode 100644
index 39ebf74..0000000
--- a/bash/patches/bash-2.05b-manso.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- bash-2.05b/doc/builtins.1.manso 2003-02-10 18:58:21.000000000 +0000
-+++ bash-2.05b/doc/builtins.1 2003-02-10 18:58:28.000000000 +0000
-@@ -10,6 +10,6 @@
- ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
- .SH BASH BUILTIN COMMANDS
- .nr zZ 1
--.so bash.1
-+.so man1/bash.1
- .SH SEE ALSO
- bash(1), sh(1)
diff --git a/bash/patches/bash-2.05b-pgrp_sync.patch b/bash/patches/bash-2.05b-pgrp_sync.patch
deleted file mode 100644
index bd7ded6..0000000
--- a/bash/patches/bash-2.05b-pgrp_sync.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bash-2.05b/aclocal.m4.pgrp_sync 2002-06-25 14:45:43.000000000 +0100
-+++ bash-2.05b/aclocal.m4 2003-01-15 18:17:35.000000000 +0000
-@@ -1255,7 +1255,7 @@
- wait(&status);
- exit(ok ? 0 : 5);
- }
--], bash_cv_pgrp_pipe=no,bash_cv_pgrp_pipe=yes,
-+], bash_cv_pgrp_pipe=yes,bash_cv_pgrp_pipe=yes,
- [AC_MSG_WARN(cannot check pgrp synchronization if cross compiling -- defaulting to no)
- bash_cv_pgrp_pipe=no])
- ])
diff --git a/bash/patches/bash-2.05b-readline-oom.patch b/bash/patches/bash-2.05b-readline-oom.patch
deleted file mode 100644
index f25d780..0000000
--- a/bash/patches/bash-2.05b-readline-oom.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bash-2.05b/lib/readline/readline.c.oom 2002-03-13 23:10:46.000000000 +0100
-+++ bash-2.05b/lib/readline/readline.c 2002-08-07 12:02:04.000000000 +0200
-@@ -817,7 +817,7 @@
- /* Special case rl_do_lowercase_version (). */
- if (func == rl_do_lowercase_version)
- /* Should we do anything special if key == ANYOTHERKEY? */
-- return (_rl_dispatch (_rl_to_lower (key), map));
-+ return (_rl_dispatch (_rl_to_lower ((unsigned char)key), map));
-
- rl_executing_keymap = map;
- rl_executing_key = key;
diff --git a/bash/patches/bash-3.2-ssh_source_bash.patch b/bash/patches/bash-3.2-ssh_source_bash.patch
deleted file mode 100644
index 5bd19ce..0000000
--- a/bash/patches/bash-3.2-ssh_source_bash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up bash-4.0/config-top.h.ssh_source_bash bash-4.0/config-top.h
---- bash-4.0/config-top.h.ssh_source_bash 2009-01-21 15:20:06.000000000 +0100
-+++ bash-4.0/config-top.h 2009-01-21 15:25:46.000000000 +0100
-@@ -90,7 +90,7 @@
- sshd and source the .bashrc if so (like the rshd behavior). This checks
- for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment,
- which can be fooled under certain not-uncommon circumstances. */
--/* #define SSH_SOURCE_BASHRC */
-+#define SSH_SOURCE_BASHRC
-
- /* Define if you want the case-capitalizing operators (~[~]) and the
- `capcase' variable attribute (declare -c). */
diff --git a/bash/patches/bash-4.0-nobits.patch b/bash/patches/bash-4.0-nobits.patch
deleted file mode 100644
index 0e77fda..0000000
--- a/bash/patches/bash-4.0-nobits.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -up bash-4.0/execute_cmd.c.nobits bash-4.0/execute_cmd.c
---- bash-4.0/execute_cmd.c.nobits 2009-08-11 11:53:38.000000000 +0200
-+++ bash-4.0/execute_cmd.c 2009-08-14 16:18:18.000000000 +0200
-@@ -4747,6 +4747,7 @@ shell_execve (command, args, env)
- && memcmp (sample, ELFMAG, SELFMAG) == 0)
- {
- off_t offset = -1;
-+ int dynamic_nobits = 0;
-
- /* It is an ELF file. Now determine whether it is dynamically
- linked and if yes, get the offset of the interpreter
-@@ -4756,13 +4757,61 @@ shell_execve (command, args, env)
- {
- Elf32_Ehdr ehdr;
- Elf32_Phdr *phdr;
-- int nphdr;
-+ Elf32_Shdr *shdr;
-+ int nphdr, nshdr;
-
- /* We have to copy the data since the sample buffer
- might not be aligned correctly to be accessed as
- an Elf32_Ehdr struct. */
- memcpy (&ehdr, sample, sizeof (Elf32_Ehdr));
-
-+ nshdr = ehdr.e_shnum;
-+ shdr = (Elf32_Shdr *) malloc (nshdr * ehdr.e_shentsize);
-+
-+ if (shdr != NULL)
-+ {
-+#ifdef HAVE_PREAD
-+ sample_len = pread (fd, shdr, nshdr * ehdr.e_shentsize,
-+ ehdr.e_shoff);
-+#else
-+ if (lseek (fd, ehdr.e_shoff, SEEK_SET) != -1)
-+ sample_len = read (fd, shdr,
-+ nshdr * ehdr.e_shentsize);
-+ else
-+ sample_len = -1;
-+#endif
-+ if (sample_len == nshdr * ehdr.e_shentsize)
-+ {
-+ char *strings = (char *) malloc (shdr[ehdr.e_shstrndx].sh_size);
-+ if (strings != NULL)
-+ {
-+#ifdef HAVE_PREAD
-+ sample_len = pread (fd, strings,
-+ shdr[ehdr.e_shstrndx].sh_size,
-+ shdr[ehdr.e_shstrndx].sh_offset);
-+#else
-+ if (lseek (fd, shdr[ehdr.e_shstrndx].sh_offset,
-+ SEEK_SET) != -1)
-+ sample_len = read (fd, strings,
-+ shdr[ehdr.e_shstrndx].sh_size);
-+ else
-+ sample_len = -1;
-+#endif
-+ if (sample_len == shdr[ehdr.e_shstrndx].sh_size)
-+ while (nshdr-- > 0)
-+ if (strcmp (strings + shdr[nshdr].sh_name,
-+ ".interp") == 0 &&
-+ shdr[nshdr].sh_type == SHT_NOBITS)
-+ {
-+ dynamic_nobits++;
-+ break;
-+ }
-+ free (strings);
-+ }
-+ }
-+ free (shdr);
-+ }
-+
- nphdr = ehdr.e_phnum;
- phdr = (Elf32_Phdr *) malloc (nphdr * ehdr.e_phentsize);
- if (phdr != NULL)
-@@ -4792,13 +4841,60 @@ shell_execve (command, args, env)
- {
- Elf64_Ehdr ehdr;
- Elf64_Phdr *phdr;
-- int nphdr;
-+ Elf64_Shdr *shdr;
-+ int nphdr, nshdr;
-
- /* We have to copy the data since the sample buffer
- might not be aligned correctly to be accessed as
- an Elf64_Ehdr struct. */
- memcpy (&ehdr, sample, sizeof (Elf64_Ehdr));
-
-+ nshdr = ehdr.e_shnum;
-+ shdr = (Elf64_Shdr *) malloc (nshdr * ehdr.e_shentsize);
-+ if (shdr != NULL)
-+ {
-+#ifdef HAVE_PREAD
-+ sample_len = pread (fd, shdr, nshdr * ehdr.e_shentsize,
-+ ehdr.e_shoff);
-+#else
-+ if (lseek (fd, ehdr.e_shoff, SEEK_SET) != -1)
-+ sample_len = read (fd, shdr,
-+ nshdr * ehdr.e_shentsize);
-+ else
-+ sample_len = -1;
-+#endif
-+ if (sample_len == nshdr * ehdr.e_shentsize)
-+ {
-+ char *strings = (char *) malloc (shdr[ehdr.e_shstrndx].sh_size);
-+ if (strings != NULL)
-+ {
-+#ifdef HAVE_PREAD
-+ sample_len = pread (fd, strings,
-+ shdr[ehdr.e_shstrndx].sh_size,
-+ shdr[ehdr.e_shstrndx].sh_offset);
-+#else
-+ if (lseek (fd, shdr[ehdr.e_shstrndx].sh_offset,
-+ SEEK_SET) != -1)
-+ sample_len = read (fd, strings,
-+ shdr[ehdr.e_shstrndx].sh_size);
-+ else
-+ sample_len = -1;
-+#endif
-+ if (sample_len == shdr[ehdr.e_shstrndx].sh_size)
-+ while (nshdr-- > 0)
-+ if (strcmp (strings + shdr[nshdr].sh_name,
-+ ".interp") == 0 &&
-+ shdr[nshdr].sh_type == SHT_NOBITS)
-+ {
-+ dynamic_nobits++;
-+ break;
-+ }
-+ free (strings);
-+ }
-+ }
-+ free (shdr);
-+ }
-+
- nphdr = ehdr.e_phnum;
- phdr = (Elf64_Phdr *) malloc (nphdr * ehdr.e_phentsize);
- if (phdr != NULL)
-@@ -4858,8 +4954,15 @@ shell_execve (command, args, env)
- {
- close (fd);
- errno = i;
-- sys_error ("%s: %s: bad ELF interpreter", command,
-- interp);
-+ if (dynamic_nobits > 0)
-+ {
-+ sys_error ("%s: bad ELF interpreter", command);
-+ }
-+ else
-+ {
-+ sys_error ("%s: %s: bad ELF interpreter", command,
-+ interp);
-+ }
- free (interp);
- return (EX_NOEXEC);
- }
diff --git a/bash/patches/bash-4.1-broken_pipe.patch b/bash/patches/bash-4.1-broken_pipe.patch
deleted file mode 100644
index e083374..0000000
--- a/bash/patches/bash-4.1-broken_pipe.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up bash-4.1/config-top.h.broken_pipe bash-4.1/config-top.h
---- bash-4.1/config-top.h.broken_pipe 2011-01-06 18:01:30.000000000 +0100
-+++ bash-4.1/config-top.h 2011-01-06 18:02:14.000000000 +0100
-@@ -51,7 +51,7 @@
- /* Define DONT_REPORT_BROKEN_PIPE_WRITE_ERRORS if you don't want builtins
- like `echo' and `printf' to report errors when output does not succeed
- due to EPIPE. */
--/* #define DONT_REPORT_BROKEN_PIPE_WRITE_ERRORS */
-+#define DONT_REPORT_BROKEN_PIPE_WRITE_ERRORS
-
- /* The default value of the PATH variable. */
- #ifndef DEFAULT_PATH_VALUE
diff --git a/bash/patches/bash-4.1-defer-sigchld-trap.patch b/bash/patches/bash-4.1-defer-sigchld-trap.patch
deleted file mode 100644
index e00adec..0000000
--- a/bash/patches/bash-4.1-defer-sigchld-trap.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -pruN bash-4.1/jobs.c bash-4.1.patched/jobs.c
---- bash-4.1/jobs.c 2009-11-30 03:42:05.000000000 +0530
-+++ bash-4.1.patched/jobs.c 2012-03-06 16:44:15.706595703 +0530
-@@ -3037,6 +3037,7 @@ waitchld (wpid, block)
- pid_t pid;
-
- int call_set_current, last_stopped_job, job, children_exited, waitpid_flags;
-+ int called_from_sighand = sigchld;
- static int wcontinued = WCONTINUED; /* run-time fix for glibc problem */
-
- call_set_current = children_exited = 0;
diff --git a/bash/patches/bash-4.1-examples.patch b/bash/patches/bash-4.1-examples.patch
deleted file mode 100644
index 19159e7..0000000
--- a/bash/patches/bash-4.1-examples.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up bash-4.1/examples/loadables/Makefile.in.examples bash-4.1/examples/loadables/Makefile.in
---- bash-4.1/examples/loadables/Makefile.in.examples 2010-06-22 16:20:02.000000000 +0200
-+++ bash-4.1/examples/loadables/Makefile.in 2010-06-22 16:20:41.000000000 +0200
-@@ -43,7 +43,7 @@ host_os = @host_os@
- host_cpu = @host_cpu@
- host_vendor = @host_vendor@
-
--CFLAGS = @CFLAGS@
-+CFLAGS = -O2 -g
- LOCAL_CFLAGS = @LOCAL_CFLAGS@
- DEFS = @DEFS@
- LOCAL_DEFS = @LOCAL_DEFS@
-diff -up bash-4.1/examples/loadables/perl/Makefile.in.examples bash-4.1/examples/loadables/perl/Makefile.in
---- bash-4.1/examples/loadables/perl/Makefile.in.examples 2010-06-22 16:20:46.000000000 +0200
-+++ bash-4.1/examples/loadables/perl/Makefile.in 2010-06-22 16:21:04.000000000 +0200
-@@ -42,7 +42,7 @@ SHELL = @MAKE_SHELL@
-
- PERL5 = perl5
-
--CFLAGS = @CFLAGS@
-+CFLAGS = -O2 -g
-
- #
- # These values are generated for configure by ${topdir}/support/shobj-conf.
diff --git a/bash/patches/bash-4.2-coverity.patch b/bash/patches/bash-4.2-coverity.patch
deleted file mode 100644
index 5fc8456..0000000
--- a/bash/patches/bash-4.2-coverity.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -up bash-4.2/execute_cmd.c.coverity bash-4.2/execute_cmd.c
---- bash-4.2/execute_cmd.c.coverity 2011-02-24 13:04:35.000000000 +0100
-+++ bash-4.2/execute_cmd.c 2011-02-24 13:49:13.000000000 +0100
-@@ -5036,7 +5036,7 @@ shell_execve (command, args, env)
- Elf32_Ehdr ehdr;
- Elf32_Phdr *phdr;
- Elf32_Shdr *shdr;
-- int nphdr, nshdr;
-+ Elf32_Half nphdr, nshdr;
-
- /* We have to copy the data since the sample buffer
- might not be aligned correctly to be accessed as
-@@ -5044,12 +5044,12 @@ shell_execve (command, args, env)
- memcpy (&ehdr, sample, sizeof (Elf32_Ehdr));
-
- nshdr = ehdr.e_shnum;
-- shdr = (Elf32_Shdr *) malloc (nshdr * ehdr.e_shentsize);
-+ shdr = (Elf32_Shdr *) malloc ((size_t)nshdr * (size_t)ehdr.e_shentsize);
-
- if (shdr != NULL)
- {
- #ifdef HAVE_PREAD
-- sample_len = pread (fd, shdr, nshdr * ehdr.e_shentsize,
-+ sample_len = pread (fd, shdr, (size_t)nshdr * (size_t)ehdr.e_shentsize,
- ehdr.e_shoff);
- #else
- if (lseek (fd, ehdr.e_shoff, SEEK_SET) != -1)
-@@ -5091,11 +5091,11 @@ shell_execve (command, args, env)
- }
-
- nphdr = ehdr.e_phnum;
-- phdr = (Elf32_Phdr *) malloc (nphdr * ehdr.e_phentsize);
-+ phdr = (Elf32_Phdr *) malloc ((size_t)nphdr * (size_t)ehdr.e_phentsize);
- if (phdr != NULL)
- {
- #ifdef HAVE_PREAD
-- sample_len = pread (fd, phdr, nphdr * ehdr.e_phentsize,
-+ sample_len = pread (fd, phdr, (size_t)nphdr * (size_t)ehdr.e_phentsize,
- ehdr.e_phoff);
- #else
- if (lseek (fd, ehdr.e_phoff, SEEK_SET) != -1)
-@@ -5120,7 +5120,7 @@ shell_execve (command, args, env)
- Elf64_Ehdr ehdr;
- Elf64_Phdr *phdr;
- Elf64_Shdr *shdr;
-- int nphdr, nshdr;
-+ Elf32_Half nphdr, nshdr;
-
- /* We have to copy the data since the sample buffer
- might not be aligned correctly to be accessed as
-@@ -5128,11 +5128,11 @@ shell_execve (command, args, env)
- memcpy (&ehdr, sample, sizeof (Elf64_Ehdr));
-
- nshdr = ehdr.e_shnum;
-- shdr = (Elf64_Shdr *) malloc (nshdr * ehdr.e_shentsize);
-+ shdr = (Elf64_Shdr *) malloc ((size_t)nshdr * (size_t)ehdr.e_shentsize);
- if (shdr != NULL)
- {
- #ifdef HAVE_PREAD
-- sample_len = pread (fd, shdr, nshdr * ehdr.e_shentsize,
-+ sample_len = pread (fd, shdr, (size_t)nshdr * (size_t)ehdr.e_shentsize,
- ehdr.e_shoff);
- #else
- if (lseek (fd, ehdr.e_shoff, SEEK_SET) != -1)
-@@ -5174,11 +5174,11 @@ shell_execve (command, args, env)
- }
-
- nphdr = ehdr.e_phnum;
-- phdr = (Elf64_Phdr *) malloc (nphdr * ehdr.e_phentsize);
-+ phdr = (Elf64_Phdr *) malloc ((size_t)nphdr * (size_t)ehdr.e_phentsize);
- if (phdr != NULL)
- {
- #ifdef HAVE_PREAD
-- sample_len = pread (fd, phdr, nphdr * ehdr.e_phentsize,
-+ sample_len = pread (fd, phdr, (size_t)nphdr * (size_t)ehdr.e_phentsize,
- ehdr.e_phoff);
- #else
- if (lseek (fd, ehdr.e_phoff, SEEK_SET) != -1)
-@@ -5200,8 +5200,8 @@ shell_execve (command, args, env)
-
- if (offset != -1)
- {
-- size_t maxlen = 0;
-- size_t actlen = 0;
-+ ssize_t maxlen = 0;
-+ ssize_t actlen = 0;
- char *interp = NULL;
-
- do
-@@ -5250,7 +5250,8 @@ shell_execve (command, args, env)
- }
- #endif
- #if defined (HAVE_HASH_BANG_EXEC) || defined (HAVE_ELF_H)
-- close (fd);
-+ if (fd >= 0)
-+ close (fd);
- #endif
- errno = i;
- file_error (command);
diff --git a/bash/patches/bash-4.2-manpage_trap.patch b/bash/patches/bash-4.2-manpage_trap.patch
deleted file mode 100644
index e81882f..0000000
--- a/bash/patches/bash-4.2-manpage_trap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up bash-4.1/doc/bash.1.manpage_trap bash-4.1/doc/bash.1
---- bash-4.1/doc/bash.1.manpage_trap 2012-08-28 10:06:00.561999092 +0200
-+++ bash-4.1/doc/bash.1 2012-08-28 10:06:24.225304505 +0200
-@@ -9251,7 +9251,7 @@ being inverted via
- These are the same conditions obeyed by the \fBerrexit\fP (\fB\-e\fP) option.
- .if t .sp 0.5
- .if n .sp 1
--Signals ignored upon entry to the shell cannot be trapped or reset.
-+Signals ignored upon entry to the shell cannot be trapped, reset or listed.
- Trapped signals that are not being ignored are reset to their original
- values in a subshell or subshell environment when one is created.
- The return status is false if any
diff --git a/bash/patches/bash-4.2-rc2-logout.patch b/bash/patches/bash-4.2-rc2-logout.patch
deleted file mode 100644
index 5aff01a..0000000
--- a/bash/patches/bash-4.2-rc2-logout.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up bash-3.2/config-top.h.logout bash-3.2/config-top.h
---- bash-3.2/config-top.h.logout 2011-04-14 08:55:55.000000000 +0200
-+++ bash-3.2/config-top.h 2011-04-14 08:55:55.000000000 +0200
-@@ -78,7 +78,7 @@
- /* #define SYS_BASHRC "/etc/bash.bashrc" */
-
- /* System-wide .bash_logout for login shells. */
--/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
-+#define SYS_BASH_LOGOUT "/etc/bash.bash_logout"
-
- /* Define this to make non-interactive shells begun with argv[0][0] == '-'
- run the startup files when not in posix mode. */
-diff -up bash-3.2/doc/bash.1.logout bash-3.2/doc/bash.1
---- bash-3.2/doc/bash.1.logout 2011-04-14 09:16:32.000000000 +0200
-+++ bash-3.2/doc/bash.1 2011-04-14 11:59:33.000000000 +0200
-@@ -326,8 +326,8 @@ option may be used when the shell is sta
- .PP
- When a login shell exits,
- .B bash
--reads and executes commands from the file \fI~/.bash_logout\fP, if it
--exists.
-+reads and executes commands from the files \fI~/.bash_logout\fP
-+and \fI/etc/bash.bash_logout\fP, if the files exists.
- .PP
- When an interactive shell that is not a login shell is started,
- .B bash
-@@ -8814,6 +8814,9 @@ The \fBbash\fP executable
- .FN /etc/profile
- The systemwide initialization file, executed for login shells
- .TP
-+.FN /etc/bash.bash_logout
-+The systemwide login shell cleanup file, executed when a login shell exits
-+.TP
- .FN ~/.bash_profile
- The personal initialization file, executed for login shells
- .TP
diff --git a/bash/patches/bash-4.2-size_type.patch b/bash/patches/bash-4.2-size_type.patch
deleted file mode 100644
index ab56677..0000000
--- a/bash/patches/bash-4.2-size_type.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up bash-4.2/variables.h.size_type bash-4.2/variables.h
---- bash-4.2/variables.h.size_type 2012-11-29 10:33:25.109036844 +0100
-+++ bash-4.2/variables.h 2012-11-29 10:46:12.718530162 +0100
-@@ -95,8 +95,8 @@ typedef struct variable {
-
- typedef struct _vlist {
- SHELL_VAR **list;
-- int list_size; /* allocated size */
-- int list_len; /* current number of entries */
-+ size_t list_size; /* allocated size */
-+ size_t list_len; /* current number of entries */
- } VARLIST;
-
- /* The various attributes that a given variable can have. */
diff --git a/bash/patches/bash-4.3-here-doc-ps2-comsub.patch0 b/bash/patches/bash-4.3-here-doc-ps2-comsub.patch0
deleted file mode 100644
index 0ccfd20..0000000
--- a/bash/patches/bash-4.3-here-doc-ps2-comsub.patch0
+++ /dev/null
@@ -1,47 +0,0 @@
-*** ../bash-4.3-patched/shell.h 2012-12-25 21:11:01.000000000 -0500
---- shell.h 2014-06-03 09:24:28.000000000 -0400
-***************
-*** 169,173 ****
- int expand_aliases;
- int echo_input_at_read;
-!
- } sh_parser_state_t;
-
---- 169,174 ----
- int expand_aliases;
- int echo_input_at_read;
-! int need_here_doc;
-!
- } sh_parser_state_t;
-
-*** ../bash-4.3-patched/parse.y 2014-05-14 09:16:40.000000000 -0400
---- parse.y 2014-04-30 09:27:59.000000000 -0400
-***************
-*** 2643,2647 ****
-
- r = 0;
-! while (need_here_doc)
- {
- parser_state |= PST_HEREDOC;
---- 2643,2647 ----
-
- r = 0;
-! while (need_here_doc > 0)
- {
- parser_state |= PST_HEREDOC;
-***************
-*** 6076,6079 ****
---- 6076,6080 ----
- ps->expand_aliases = expand_aliases;
- ps->echo_input_at_read = echo_input_at_read;
-+ ps->need_here_doc = need_here_doc;
-
- ps->token = token;
-***************
-*** 6124,6127 ****
---- 6125,6129 ----
- expand_aliases = ps->expand_aliases;
- echo_input_at_read = ps->echo_input_at_read;
-+ need_here_doc = ps->need_here_doc;
-
- FREE (token);
diff --git a/bash/patches/bash-4.3-lastpipe-nested-pipe-segfault.patch0 b/bash/patches/bash-4.3-lastpipe-nested-pipe-segfault.patch0
deleted file mode 100644
index 200a84f..0000000
--- a/bash/patches/bash-4.3-lastpipe-nested-pipe-segfault.patch0
+++ /dev/null
@@ -1,24 +0,0 @@
-*** ../bash-4.3-patched/execute_cmd.c 2014-01-31 10:54:52.000000000 -0500
---- execute_cmd.c 2014-06-19 08:05:49.000000000 -0400
-***************
-*** 2410,2414 ****
- lstdin = wait_for (lastpid);
- #if defined (JOB_CONTROL)
-! exec_result = job_exit_status (lastpipe_jid);
- #endif
- unfreeze_jobs_list ();
---- 2425,2438 ----
- lstdin = wait_for (lastpid);
- #if defined (JOB_CONTROL)
-! /* If wait_for removes the job from the jobs table, use result of last
-! command as pipeline's exit status as usual. The jobs list can get
-! frozen and unfrozen at inconvenient times if there are multiple pipelines
-! running simultaneously. */
-! if (INVALID_JOB (lastpipe_jid) == 0)
-! exec_result = job_exit_status (lastpipe_jid);
-! else if (pipefail_opt)
-! exec_result = exec_result | lstdin; /* XXX */
-! /* otherwise we use exec_result */
-!
- #endif
- unfreeze_jobs_list ();
diff --git a/bash/patches/bash-4.3-man-ulimit.patch b/bash/patches/bash-4.3-man-ulimit.patch
deleted file mode 100644
index fdba544..0000000
--- a/bash/patches/bash-4.3-man-ulimit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ccd35766d2451677f4c49f66b8e18ad6e274d56a Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup(a)redhat.com>
-Date: Mon, 7 Jul 2014 07:15:41 +0200
-Subject: [PATCH] bash.1: posix block size for cf options
-
----
- doc/bash.1 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/doc/bash.1 b/doc/bash.1
-index a4ad746..1916515 100644
---- a/doc/bash.1
-+++ b/doc/bash.1
-@@ -9451,6 +9451,7 @@ and
- which are unscaled values.
- The return status is 0 unless an invalid option or argument is supplied,
- or an error occurs while setting a new limit.
-+In POSIX Mode 512-byte blocks are used for the `-c' and `-f' options.
- .RE
- .TP
- \fBumask\fP [\fB\-p\fP] [\fB\-S\fP] [\fImode\fP]
---
-1.9.3
-
diff --git a/bash/patches/bash-4.3-parse-time-keyword.patch0 b/bash/patches/bash-4.3-parse-time-keyword.patch0
deleted file mode 100644
index 40337f5..0000000
--- a/bash/patches/bash-4.3-parse-time-keyword.patch0
+++ /dev/null
@@ -1,28 +0,0 @@
-*** ../bash-4.3-patched/parse.y 2014-04-07 11:56:12.000000000 -0400
---- parse.y 2014-06-11 10:25:53.000000000 -0400
-***************
-*** 2789,2797 ****
- case OR_OR:
- case '&':
- case DO:
- case THEN:
- case ELSE:
- case '{': /* } */
-! case '(': /* ) */
- case BANG: /* ! time pipeline */
- case TIME: /* time time pipeline */
---- 2789,2802 ----
- case OR_OR:
- case '&':
-+ case WHILE:
- case DO:
-+ case UNTIL:
-+ case IF:
- case THEN:
-+ case ELIF:
- case ELSE:
- case '{': /* } */
-! case '(': /* )( */
-! case ')': /* only valid in case statement */
- case BANG: /* ! time pipeline */
- case TIME: /* time time pipeline */
diff --git a/bash/patches/bash-4.3-pathexp-globignore-delim.patch0 b/bash/patches/bash-4.3-pathexp-globignore-delim.patch0
deleted file mode 100644
index 6b019f9..0000000
--- a/bash/patches/bash-4.3-pathexp-globignore-delim.patch0
+++ /dev/null
@@ -1,15 +0,0 @@
-*** ../bash-4.3-patched/pathexp.c 2014-01-31 09:34:33.000000000 -0500
---- pathexp.c 2014-06-20 15:33:09.000000000 -0400
-***************
-*** 539,543 ****
- return 0;
-
-! n = skip_to_delim (s, i, ":", SD_NOJMP|SD_EXTGLOB);
- t = substring (s, i, n);
-
---- 539,543 ----
- return 0;
-
-! n = skip_to_delim (s, i, ":", SD_NOJMP|SD_EXTGLOB|SD_GLOB);
- t = substring (s, i, n);
-
diff --git a/bash/patches/bash-4.3-readline-revert-lines.patch0 b/bash/patches/bash-4.3-readline-revert-lines.patch0
deleted file mode 100644
index 2ce3d87..0000000
--- a/bash/patches/bash-4.3-readline-revert-lines.patch0
+++ /dev/null
@@ -1,18 +0,0 @@
-*** ../bash-4.3-patched/lib/readline/misc.c 2012-09-01 18:03:11.000000000 -0400
---- lib/readline/misc.c 2014-06-30 13:41:19.000000000 -0400
-***************
-*** 462,465 ****
---- 462,466 ----
- /* Set up rl_line_buffer and other variables from history entry */
- rl_replace_from_history (entry, 0); /* entry->line is now current */
-+ entry->data = 0; /* entry->data is now current undo list */
- /* Undo all changes to this history entry */
- while (rl_undo_list)
-***************
-*** 469,473 ****
- FREE (entry->line);
- entry->line = savestring (rl_line_buffer);
-- entry->data = 0;
- }
- entry = previous_history ();
---- 470,473 ----
diff --git a/bash/patches/bash-bashbug.patch b/bash/patches/bash-bashbug.patch
deleted file mode 100644
index 7ed60d2..0000000
--- a/bash/patches/bash-bashbug.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -up bash-4.2-rc2/doc/bash.1.bashbug bash-4.2-rc2/doc/bash.1
---- bash-4.2-rc2/doc/bash.1.bashbug 2011-01-16 21:31:39.000000000 +0100
-+++ bash-4.2-rc2/doc/bash.1 2011-02-09 08:52:14.000000000 +0100
-@@ -9857,7 +9857,7 @@ The latest version is always available f
- .PP
- Once you have determined that a bug actually exists, use the
- .I bashbug
--command to submit a bug report.
-+command (from the source package) to submit a bug report.
- If you have a fix, you are encouraged to mail that as well!
- Suggestions and `philosophical' bug reports may be mailed
- to \fIbug-bash(a)gnu.org\fP or posted to the Usenet
-@@ -9879,10 +9879,6 @@ A description of the bug behaviour
- A short script or `recipe' which exercises the bug
- .PD
- .PP
--.I bashbug
--inserts the first three items automatically into the template
--it provides for filing a bug report.
--.PP
- Comments and bug reports concerning
- this manual page should be directed to
- .IR chet.ramey(a)case.edu .
-diff -up bash-4.2-rc2/doc/bashref.texi.bashbug bash-4.2-rc2/doc/bashref.texi
---- bash-4.2-rc2/doc/bashref.texi.bashbug 2011-01-16 21:31:57.000000000 +0100
-+++ bash-4.2-rc2/doc/bashref.texi 2011-02-09 08:47:07.000000000 +0100
-@@ -7635,7 +7635,7 @@ The latest version of Bash is always ava
- @uref{ftp://ftp.gnu.org/pub/gnu/bash/}.
-
- Once you have determined that a bug actually exists, use the
--@code{bashbug} command to submit a bug report.
-+@code{bashbug} command (from the source package) to submit a bug report.
- If you have a fix, you are encouraged to mail that as well!
- Suggestions and `philosophical' bug reports may be mailed
- to @email{bug-bash@@gnu.org} or posted to the Usenet
-@@ -7657,9 +7657,6 @@ to reproduce it.
- @end itemize
-
- @noindent
--@code{bashbug} inserts the first three items automatically into
--the template it provides for filing a bug report.
--
- Please send all reports concerning this manual to
- @email{bug-bash@@gnu.org}.
-
-diff -up bash-4.2-rc2/shell.c.bashbug bash-4.2-rc2/shell.c
---- bash-4.2-rc2/shell.c.bashbug 2011-01-02 22:04:51.000000000 +0100
-+++ bash-4.2-rc2/shell.c 2011-02-09 08:47:07.000000000 +0100
-@@ -1823,7 +1823,6 @@ show_shell_usage (fp, extra)
- {
- fprintf (fp, _("Type `%s -c \"help set\"' for more information about shell options.\n"), shell_name);
- fprintf (fp, _("Type `%s -c help' for more information about shell builtin commands.\n"), shell_name);
-- fprintf (fp, _("Use the `bashbug' command to report bugs.\n"));
- }
- }
-
diff --git a/bash/patches/bash-infotags.patch b/bash/patches/bash-infotags.patch
deleted file mode 100644
index 2e50d6e..0000000
--- a/bash/patches/bash-infotags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- bash-3.1/doc/Makefile.in.infotags 2006-07-12 13:57:18.000000000 +0100
-+++ bash-3.1/doc/Makefile.in 2006-07-12 13:58:25.000000000 +0100
-@@ -69,7 +69,6 @@
- TEXI2HTML = ${SUPPORT_SRCDIR}/texi2html
- MAN2HTML = ${BUILD_DIR}/support/man2html
- HTMLPOST = ${srcdir}/htmlpost.sh
--INFOPOST = ${srcdir}/infopost.sh
- QUIETPS = #set this to -q to shut up dvips
- PAPERSIZE = letter # change to a4 for A4-size paper
- PSDPI = 600 # could be 300 if you like
-@@ -146,7 +145,7 @@
-
- PSFILES = bash.ps bashbug.ps article.ps builtins.ps rbash.ps
- DVIFILES = bashref.dvi bashref.ps
--INFOFILES = bashref.info
-+INFOFILES = bashref.info bash.info
- MAN0FILES = bash.0 bashbug.0 builtins.0 rbash.0
- HTMLFILES = bashref.html bash.html
- PDFFILES = bash.pdf bashref.pdf article.pdf rose94.pdf
-@@ -167,8 +166,8 @@
- bashref.html: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
- $(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi
-
--bash.info: bashref.info
-- ${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \
-+bash.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
-+ $(MAKEINFO) --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi -o $@
-
- bash.txt: bash.1
- bash.ps: bash.1
diff --git a/bash/patches/bash-requires.patch b/bash/patches/bash-requires.patch
index 5d82ac6..888de17 100644
--- a/bash/patches/bash-requires.patch
+++ b/bash/patches/bash-requires.patch
@@ -1,19 +1,28 @@
-diff -up bash-4.1/builtins.h.requires bash-4.1/builtins.h
---- bash-4.1/builtins.h.requires 2009-01-04 20:32:23.000000000 +0100
-+++ bash-4.1/builtins.h 2010-08-02 17:42:41.000000000 +0200
-@@ -41,6 +41,8 @@
- #define SPECIAL_BUILTIN 0x08 /* This is a Posix `special' builtin. */
+commit efb0da0c0fee3e3ca21b21cd72f63cdfd7766d45
+Author: Michael Tremer <michael.tremer(a)ipfire.org>
+Date: Sun Sep 18 14:12:44 2016 +0100
+
+ Implement --rpm-requires
+
+ Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
+
+diff --git a/builtins.h b/builtins.h
+index 0cfea18..c0c6acc 100644
+--- a/builtins.h
++++ b/builtins.h
+@@ -42,6 +42,7 @@
#define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */
#define POSIX_BUILTIN 0x20 /* This builtins is special in the Posix command search order. */
-+#define REQUIRES_BUILTIN 0x40 /* This builtin requires other files. */
-+
+ #define LOCALVAR_BUILTIN 0x40 /* This builtin creates local variables */
++#define REQUIRES_BUILTIN 0x80 /* This builtin requires other files. */
#define BASE_INDENT 4
-diff -up bash-4.1/builtins/mkbuiltins.c.requires bash-4.1/builtins/mkbuiltins.c
---- bash-4.1/builtins/mkbuiltins.c.requires 2009-01-04 20:32:23.000000000 +0100
-+++ bash-4.1/builtins/mkbuiltins.c 2010-08-02 17:42:41.000000000 +0200
-@@ -69,9 +69,15 @@ extern char *strcpy ();
+diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c
+index 4f51201..69707ec 100644
+--- a/builtins/mkbuiltins.c
++++ b/builtins/mkbuiltins.c
+@@ -69,10 +69,15 @@ extern char *strcpy ();
#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
/* Flag values that builtins can have. */
@@ -23,13 +32,13 @@ diff -up bash-4.1/builtins/mkbuiltins.c.requires bash-4.1/builtins/mkbuiltins.c
+ in ../builtins.h */
#define BUILTIN_FLAG_SPECIAL 0x01
#define BUILTIN_FLAG_ASSIGNMENT 0x02
- #define BUILTIN_FLAG_POSIX_BUILTIN 0x04
-+#define BUILTIN_FLAG_REQUIRES 0x08
-+
+ #define BUILTIN_FLAG_LOCALVAR 0x04
+ #define BUILTIN_FLAG_POSIX_BUILTIN 0x08
++#define BUILTIN_FLAG_REQUIRES 0x16
#define BASE_INDENT 4
-@@ -163,10 +169,18 @@ char *posix_builtins[] =
+@@ -173,11 +178,19 @@ char *posix_builtins[] =
(char *)NULL
};
@@ -43,13 +52,14 @@ diff -up bash-4.1/builtins/mkbuiltins.c.requires bash-4.1/builtins/mkbuiltins.c
/* Forward declarations. */
static int is_special_builtin ();
static int is_assignment_builtin ();
+ static int is_localvar_builtin ();
static int is_posix_builtin ();
+static int is_requires_builtin ();
#if !defined (HAVE_RENAME)
static int rename ();
-@@ -812,6 +826,9 @@ builtin_handler (self, defs, arg)
- new->flags |= BUILTIN_FLAG_ASSIGNMENT;
+@@ -831,6 +844,9 @@ builtin_handler (self, defs, arg)
+ new->flags |= BUILTIN_FLAG_LOCALVAR;
if (is_posix_builtin (name))
new->flags |= BUILTIN_FLAG_POSIX_BUILTIN;
+ if (is_requires_builtin (name))
@@ -58,21 +68,22 @@ diff -up bash-4.1/builtins/mkbuiltins.c.requires bash-4.1/builtins/mkbuiltins.c
array_add ((char *)new, defs->builtins);
building_builtin = 1;
-@@ -1229,11 +1246,12 @@ write_builtins (defs, structfile, extern
+@@ -1250,12 +1266,13 @@ write_builtins (defs, structfile, externfile)
else
fprintf (structfile, "(sh_builtin_func_t *)0x0, ");
-- fprintf (structfile, "%s%s%s%s, %s_doc,\n",
-+ fprintf (structfile, "%s%s%s%s%s, %s_doc,\n",
+- fprintf (structfile, "%s%s%s%s%s, %s_doc,\n",
++ fprintf (structfile, "%s%s%s%s%s%s, %s_doc,\n",
"BUILTIN_ENABLED | STATIC_BUILTIN",
(builtin->flags & BUILTIN_FLAG_SPECIAL) ? " | SPECIAL_BUILTIN" : "",
(builtin->flags & BUILTIN_FLAG_ASSIGNMENT) ? " | ASSIGNMENT_BUILTIN" : "",
+ (builtin->flags & BUILTIN_FLAG_LOCALVAR) ? " | LOCALVAR_BUILTIN" : "",
(builtin->flags & BUILTIN_FLAG_POSIX_BUILTIN) ? " | POSIX_BUILTIN" : "",
+ (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " | REQUIRES_BUILTIN" : "",
document_name (builtin));
- if (inhibit_functions)
-@@ -1581,6 +1599,13 @@ is_posix_builtin (name)
+ /* Don't translate short document summaries that are identical
+@@ -1645,6 +1662,13 @@ is_posix_builtin (name)
return (_find_in_table (name, posix_builtins));
}
@@ -86,10 +97,11 @@ diff -up bash-4.1/builtins/mkbuiltins.c.requires bash-4.1/builtins/mkbuiltins.c
#if !defined (HAVE_RENAME)
static int
rename (from, to)
-diff -up bash-4.1/doc/bash.1.requires bash-4.1/doc/bash.1
---- bash-4.1/doc/bash.1.requires 2010-08-02 17:42:41.000000000 +0200
-+++ bash-4.1/doc/bash.1 2010-08-02 18:09:27.000000000 +0200
-@@ -231,6 +231,14 @@ The shell becomes restricted (see
+diff --git a/doc/bash.1 b/doc/bash.1
+index 9a7a384..1c738bb 100644
+--- a/doc/bash.1
++++ b/doc/bash.1
+@@ -238,6 +238,14 @@ The shell becomes restricted (see
.B "RESTRICTED SHELL"
below).
.TP
@@ -102,12 +114,13 @@ diff -up bash-4.1/doc/bash.1.requires bash-4.1/doc/bash.1
+builtin are not parsed so some dependencies may be missed.
+.TP
.B \-\-verbose
- Equivalent to \fB\-v\fP.
+ Equivalent to \fB\-v\fP.
.TP
-diff -up bash-4.1/doc/bashref.texi.requires bash-4.1/doc/bashref.texi
---- bash-4.1/doc/bashref.texi.requires 2010-08-02 17:42:41.000000000 +0200
-+++ bash-4.1/doc/bashref.texi 2010-08-02 18:11:58.000000000 +0200
-@@ -5343,6 +5343,13 @@ standard. @xref{Bash POSIX Mode}, for a
+diff --git a/doc/bashref.texi b/doc/bashref.texi
+index c0f4a2f..8e30d4f 100644
+--- a/doc/bashref.texi
++++ b/doc/bashref.texi
+@@ -6243,6 +6243,13 @@ standard. @xref{Bash POSIX Mode}, for a description of the Bash
@item --restricted
Make the shell a restricted shell (@pxref{The Restricted Shell}).
@@ -121,18 +134,19 @@ diff -up bash-4.1/doc/bashref.texi.requires bash-4.1/doc/bashref.texi
@item --verbose
Equivalent to @option{-v}. Print shell input lines as they're read.
-diff -up bash-4.1/eval.c.requires bash-4.1/eval.c
---- bash-4.1/eval.c.requires 2009-01-04 20:32:26.000000000 +0100
-+++ bash-4.1/eval.c 2010-08-02 17:42:41.000000000 +0200
-@@ -53,6 +53,7 @@ extern int last_command_exit_value, stdi
- extern int need_here_doc;
+diff --git a/eval.c b/eval.c
+index db863e7..5a5af32 100644
+--- a/eval.c
++++ b/eval.c
+@@ -56,6 +56,7 @@ extern int need_here_doc;
extern int current_command_number, current_command_line_count, line_number;
extern int expand_aliases;
+ extern char *ps0_prompt;
+extern int rpm_requires;
#if defined (HAVE_POSIX_SIGNALS)
extern sigset_t top_level_mask;
-@@ -136,7 +137,7 @@ reader_loop ()
+@@ -148,7 +149,7 @@ reader_loop ()
if (read_command () == 0)
{
@@ -141,10 +155,11 @@ diff -up bash-4.1/eval.c.requires bash-4.1/eval.c
{
last_command_exit_value = EXECUTION_SUCCESS;
dispose_command (global_command);
-diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c
---- bash-4.1/execute_cmd.c.requires 2010-08-02 17:42:41.000000000 +0200
-+++ bash-4.1/execute_cmd.c 2010-08-02 17:42:41.000000000 +0200
-@@ -503,6 +503,8 @@ async_redirect_stdin ()
+diff --git a/execute_cmd.c b/execute_cmd.c
+index 2a3df6d..2e3fb0c 100644
+--- a/execute_cmd.c
++++ b/execute_cmd.c
+@@ -529,6 +529,8 @@ async_redirect_stdin ()
#define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0)
@@ -153,7 +168,7 @@ diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c
/* Execute the command passed in COMMAND, perhaps doing it asynchronously.
COMMAND is exactly what read_command () places into GLOBAL_COMMAND.
ASYNCHROUNOUS, if non-zero, says to do this command in the background.
-@@ -534,7 +536,13 @@ execute_command_internal (command, async
+@@ -561,7 +563,13 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out,
if (breaking || continuing)
return (last_command_exit_value);
@@ -168,7 +183,7 @@ diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c
return (EXECUTION_SUCCESS);
QUIT;
-@@ -5066,7 +5074,7 @@ execute_intern_function (name, function)
+@@ -5609,7 +5617,7 @@ execute_intern_function (name, funcdef)
if (check_identifier (name, posixly_correct) == 0)
{
@@ -177,9 +192,10 @@ diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c
{
last_command_exit_value = EX_BADUSAGE;
jump_to_top_level (ERREXIT);
-diff -up bash-4.1/execute_cmd.h.requires bash-4.1/execute_cmd.h
---- bash-4.1/execute_cmd.h.requires 2009-01-16 22:20:15.000000000 +0100
-+++ bash-4.1/execute_cmd.h 2010-08-02 17:42:41.000000000 +0200
+diff --git a/execute_cmd.h b/execute_cmd.h
+index 62bec82..d42dc85 100644
+--- a/execute_cmd.h
++++ b/execute_cmd.h
@@ -22,6 +22,8 @@
#define _EXECUTE_CMD_H_
@@ -187,11 +203,12 @@ diff -up bash-4.1/execute_cmd.h.requires bash-4.1/execute_cmd.h
+#include "variables.h"
+#include "command.h"
- extern struct fd_bitmap *new_fd_bitmap __P((int));
- extern void dispose_fd_bitmap __P((struct fd_bitmap *));
-diff -up bash-4.1/make_cmd.c.requires bash-4.1/make_cmd.c
---- bash-4.1/make_cmd.c.requires 2009-09-11 23:26:12.000000000 +0200
-+++ bash-4.1/make_cmd.c 2010-08-02 17:42:41.000000000 +0200
+ #if defined (ARRAY_VARS)
+ struct func_array_state
+diff --git a/make_cmd.c b/make_cmd.c
+index b42e9ff..95ec723 100644
+--- a/make_cmd.c
++++ b/make_cmd.c
@@ -42,11 +42,15 @@
#include "flags.h"
#include "make_cmd.h"
@@ -208,18 +225,21 @@ diff -up bash-4.1/make_cmd.c.requires bash-4.1/make_cmd.c
#if defined (JOB_CONTROL)
#include "jobs.h"
-@@ -56,6 +60,10 @@
-
+@@ -57,9 +61,13 @@
extern int line_number, current_command_line_count, parser_state;
extern int last_command_exit_value;
+ extern int shell_initialized;
+extern int rpm_requires;
-+
+
+ int here_doc_first_line = 0;
+
+static char *alphabet_set = "abcdefghijklmnopqrstuvwxyz"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
++
/* Object caching */
sh_obj_cache_t wdcache = {0, 0, 0};
-@@ -820,6 +828,27 @@ make_coproc_command (name, command)
+ sh_obj_cache_t wlcache = {0, 0, 0};
+@@ -839,6 +847,27 @@ make_coproc_command (name, command)
return (make_command (cm_coproc, (SIMPLE_COM *)temp));
}
@@ -247,7 +267,7 @@ diff -up bash-4.1/make_cmd.c.requires bash-4.1/make_cmd.c
/* Reverse the word list and redirection list in the simple command
has just been parsed. It seems simpler to do this here the one
time then by any other method that I can think of. */
-@@ -837,6 +866,27 @@ clean_simple_command (command)
+@@ -856,6 +885,27 @@ clean_simple_command (command)
REVERSE_LIST (command->value.Simple->redirects, REDIRECT *);
}
@@ -275,12 +295,13 @@ diff -up bash-4.1/make_cmd.c.requires bash-4.1/make_cmd.c
parser_state &= ~PST_REDIRLIST;
return (command);
}
-diff -up bash-4.1/shell.c.requires bash-4.1/shell.c
---- bash-4.1/shell.c.requires 2010-08-02 17:42:41.000000000 +0200
-+++ bash-4.1/shell.c 2010-08-02 17:42:41.000000000 +0200
-@@ -193,6 +193,9 @@ int have_devfd = 0;
+diff --git a/shell.c b/shell.c
+index 45b77f9..b43de50 100644
+--- a/shell.c
++++ b/shell.c
+@@ -201,6 +201,9 @@ int have_devfd = 0;
/* The name of the .(shell)rc file. */
- static char *bashrc_file = "~/.bashrc";
+ static char *bashrc_file = DEFAULT_BASHRC;
+/* Non-zero if we are finding the scripts requirements. */
+int rpm_requires;
@@ -288,7 +309,7 @@ diff -up bash-4.1/shell.c.requires bash-4.1/shell.c
/* Non-zero means to act more like the Bourne shell on startup. */
static int act_like_sh;
-@@ -251,6 +254,7 @@ static const struct {
+@@ -264,6 +267,7 @@ static const struct {
{ "protected", Int, &protected_mode, (char **)0x0 },
#endif
{ "rcfile", Charp, (int *)0x0, &bashrc_file },
@@ -296,7 +317,7 @@ diff -up bash-4.1/shell.c.requires bash-4.1/shell.c
#if defined (RESTRICTED_SHELL)
{ "restricted", Int, &restricted, (char **)0x0 },
#endif
-@@ -485,6 +489,12 @@ main (argc, argv, env)
+@@ -500,6 +504,12 @@ main (argc, argv, env)
if (dump_translatable_strings)
read_but_dont_execute = 1;
diff --git a/bash/patches/bash43-001 b/bash/patches/bash43-001
deleted file mode 100644
index ea1c6b2..0000000
--- a/bash/patches/bash43-001
+++ /dev/null
@@ -1,58 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-001
-
-Bug-Reported-by: NBaH <nbah(a)sfr.fr>
-Bug-Reference-ID: <ler0b5$iu9$1(a)speranza.aioe.org>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00092.html
-
-Bug-Description:
-
-A missing check for a valid option prevented `test -R' from working. There
-is another problem that causes bash to look up the wrong variable name when
-processing the argument to `test -R'.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/test.c 2014-02-04 16:52:58.000000000 -0500
---- test.c 2014-02-28 21:22:44.000000000 -0500
-***************
-*** 647,652 ****
-
- case 'R':
-! v = find_variable (arg);
-! return (v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v) ? TRUE : FALSE);
- }
-
---- 647,652 ----
-
- case 'R':
-! v = find_variable_noref (arg);
-! return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)) ? TRUE : FALSE);
- }
-
-***************
-*** 724,727 ****
---- 724,728 ----
- case 'u': case 'v': case 'w': case 'x': case 'z':
- case 'G': case 'L': case 'O': case 'S': case 'N':
-+ case 'R':
- return (1);
- }
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 0
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 1
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-002 b/bash/patches/bash43-002
deleted file mode 100644
index 735b7b8..0000000
--- a/bash/patches/bash43-002
+++ /dev/null
@@ -1,62 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-002
-
-Bug-Reported-by: Moe Tunes <moetunes42(a)gmail.com>
-Bug-Reference-ID: <53103F49.3070100(a)gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00086.html
-
-Bug-Description:
-
-A change to save state while running the DEBUG trap caused pipelines to hang
-on systems which need process group synchronization while building pipelines.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/trap.c 2014-02-05 10:03:21.000000000 -0500
---- trap.c 2014-02-28 09:51:43.000000000 -0500
-***************
-*** 921,925 ****
-
- #if defined (JOB_CONTROL)
-! save_pipeline (1); /* XXX only provides one save level */
- #endif
-
---- 921,926 ----
-
- #if defined (JOB_CONTROL)
-! if (sig != DEBUG_TRAP) /* run_debug_trap does this */
-! save_pipeline (1); /* XXX only provides one save level */
- #endif
-
-***************
-*** 941,945 ****
-
- #if defined (JOB_CONTROL)
-! restore_pipeline (1);
- #endif
-
---- 942,947 ----
-
- #if defined (JOB_CONTROL)
-! if (sig != DEBUG_TRAP) /* run_debug_trap does this */
-! restore_pipeline (1);
- #endif
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 1
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 2
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-003 b/bash/patches/bash43-003
deleted file mode 100644
index 0f32f41..0000000
--- a/bash/patches/bash43-003
+++ /dev/null
@@ -1,48 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-003
-
-Bug-Reported-by: Anatol Pomozov <anatol.pomozov(a)gmail.com>
-Bug-Reference-ID: <CAOMFOmXy3mT2So5GQ5F-smCVArQuAeBwZ2QKzgCtMeXJoDeYOQ(a)mail.gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html
-
-Bug-Description:
-
-When in callback mode, some readline commands can cause readline to seg
-fault by passing invalid contexts to callback functions.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000 -0400
---- lib/readline/readline.c 2014-03-10 14:15:02.000000000 -0400
-***************
-*** 745,749 ****
-
- RL_CHECK_SIGNALS ();
-! if (r == 0) /* success! */
- {
- _rl_keyseq_chain_dispose ();
---- 745,750 ----
-
- RL_CHECK_SIGNALS ();
-! /* We only treat values < 0 specially to simulate recursion. */
-! if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */
- {
- _rl_keyseq_chain_dispose ();
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 2
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 3
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-004 b/bash/patches/bash43-004
deleted file mode 100644
index 010f04a..0000000
--- a/bash/patches/bash43-004
+++ /dev/null
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-004
-
-Bug-Reported-by: Daan van Rossum <daan(a)flash.uchicago.edu>
-Bug-Reference-ID: <20140307072523.GA14250(a)flash.uchicago.edu>
-Bug-Reference-URL:
-
-Bug-Description:
-
-The `.' command in vi mode cannot undo multi-key commands beginning with
-`c', `d', and `y' (command plus motion specifier).
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/lib/readline/readline.c 2013-10-28 14:58:06.000000000 -0400
---- lib/readline/readline.c 2014-03-07 15:20:33.000000000 -0500
-***************
-*** 965,969 ****
- if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
- key != ANYOTHERKEY &&
-! rl_key_sequence_length == 1 && /* XXX */
- _rl_vi_textmod_command (key))
- _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
---- 965,969 ----
- if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
- key != ANYOTHERKEY &&
-! _rl_dispatching_keymap == vi_movement_keymap &&
- _rl_vi_textmod_command (key))
- _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 3
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 4
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-005 b/bash/patches/bash43-005
deleted file mode 100644
index bcd4069..0000000
--- a/bash/patches/bash43-005
+++ /dev/null
@@ -1,63 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-005
-
-Bug-Reported-by: David Sines <dave.gma(a)googlemail.com>
-Bug-Reference-ID: <CAO3BAa_CK_Rgkhdfzs+NJ4KFYdB9qW3pvXQK0xLCi6GMmDU8bw(a)mail.gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00037.html
-
-Bug-Description:
-
-When in Posix mode, bash did not correctly interpret the ANSI-C-style
-$'...' quoting mechanism when performing pattern substitution word
-expansions within double quotes.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/parse.y 2014-02-11 09:42:10.000000000 -0500
---- parse.y 2014-03-07 20:57:15.000000000 -0500
-***************
-*** 3399,3403 ****
- unescaped double-quotes or single-quotes, if any, shall occur." */
- /* This was changed in Austin Group Interp 221 */
-! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
- continue;
-
---- 3399,3403 ----
- unescaped double-quotes or single-quotes, if any, shall occur." */
- /* This was changed in Austin Group Interp 221 */
-! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
- continue;
-
-*** ../bash-4.3/y.tab.c 2014-02-11 10:57:47.000000000 -0500
---- y.tab.c 2014-03-28 10:41:15.000000000 -0400
-***************
-*** 5711,5715 ****
- unescaped double-quotes or single-quotes, if any, shall occur." */
- /* This was changed in Austin Group Interp 221 */
-! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
- continue;
-
---- 5711,5715 ----
- unescaped double-quotes or single-quotes, if any, shall occur." */
- /* This was changed in Austin Group Interp 221 */
-! if MBTEST(posixly_correct && shell_compatibility_level > 41 && dolbrace_state != DOLBRACE_QUOTE && dolbrace_state != DOLBRACE_QUOTE2 && (flags & P_DQUOTE) && (flags & P_DOLBRACE) && ch == '\'')
- continue;
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 4
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 5
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-006 b/bash/patches/bash43-006
deleted file mode 100644
index 24ff057..0000000
--- a/bash/patches/bash43-006
+++ /dev/null
@@ -1,48 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-006
-
-Bug-Reported-by: Eduardo A . Bustamante Lopez <dualbus(a)gmail.com>
-Bug-Reference-ID: <20140228170013.GA16015(a)dualbus.me>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-02/msg00091.html
-
-Bug-Description:
-
-A shell that started with job control active but was not interactive left
-the terminal in the wrong process group when exiting, causing its parent
-shell to get a stop signal when it attempted to read from the terminal.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/jobs.c 2014-01-10 09:05:34.000000000 -0500
---- jobs.c 2014-03-02 18:05:09.000000000 -0500
-***************
-*** 4375,4379 ****
- end_job_control ()
- {
-! if (interactive_shell) /* XXX - should it be interactive? */
- {
- terminate_stopped_jobs ();
---- 4375,4379 ----
- end_job_control ()
- {
-! if (interactive_shell || job_control) /* XXX - should it be just job_control? */
- {
- terminate_stopped_jobs ();
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 5
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 6
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-007 b/bash/patches/bash43-007
deleted file mode 100644
index 0d62c9e..0000000
--- a/bash/patches/bash43-007
+++ /dev/null
@@ -1,50 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-007
-
-Bug-Reported-by: geir.hauge(a)gmail.com
-Bug-Reference-ID: <20140318093650.B181C1C5B0B(a)gina.itea.ntnu.no>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00095.html
-
-Bug-Description:
-
-Using compound assignments for associative arrays like
-
-assoc=( [x]= [y]=bar )
-
-left the value corresponding to the key `x' NULL. This caused subsequent
-lookups to interpret it as unset.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/arrayfunc.c 2013-08-02 16:19:59.000000000 -0400
---- arrayfunc.c 2014-03-18 11:08:15.000000000 -0400
-***************
-*** 598,601 ****
---- 598,606 ----
- {
- val = expand_assignment_string_to_string (val, 0);
-+ if (val == 0)
-+ {
-+ val = (char *)xmalloc (1);
-+ val[0] = '\0'; /* like do_assignment_internal */
-+ }
- free_val = 1;
- }
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 6
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 7
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-008 b/bash/patches/bash43-008
deleted file mode 100644
index 0ae7c95..0000000
--- a/bash/patches/bash43-008
+++ /dev/null
@@ -1,188 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-008
-
-Bug-Reported-by: Stephane Chazelas <stephane.chazelas(a)gmail.com>
-Bug-Reference-ID: <20140318135901.GB22158(a)chaz.gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00098.html
-
-Bug-Description:
-
-Some extended glob patterns incorrectly matched filenames with a leading
-dot, regardless of the setting of the `dotglob' option.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3/lib/glob/gmisc.c 2013-10-28 14:45:25.000000000 -0400
---- lib/glob/gmisc.c 2014-03-19 09:16:08.000000000 -0400
-***************
-*** 211,214 ****
---- 211,215 ----
- case '!':
- case '@':
-+ case '?':
- return (pat[1] == LPAREN);
- default:
-*** ../bash-4.3/lib/glob/glob.c 2014-01-31 21:43:51.000000000 -0500
---- lib/glob/glob.c 2014-03-20 09:01:26.000000000 -0400
-***************
-*** 180,202 ****
- int flags;
- {
-! char *pp, *pe, *t;
-! int n, r;
-
- pp = pat + 2;
-! pe = pp + strlen (pp) - 1; /*(*/
-! if (*pe != ')')
-! return 0;
-! if ((t = strchr (pp, '|')) == 0) /* easy case first */
- {
- *pe = '\0';
- r = skipname (pp, dname, flags); /*(*/
- *pe = ')';
- return r;
- }
- while (t = glob_patscan (pp, pe, '|'))
- {
- n = t[-1];
- t[-1] = '\0';
- r = skipname (pp, dname, flags);
- t[-1] = n;
- if (r == 0) /* if any pattern says not skip, we don't skip */
---- 180,215 ----
- int flags;
- {
-! char *pp, *pe, *t, *se;
-! int n, r, negate;
-
-+ negate = *pat == '!';
- pp = pat + 2;
-! se = pp + strlen (pp) - 1; /* end of string */
-! pe = glob_patscan (pp, se, 0); /* end of extglob pattern (( */
-! /* we should check for invalid extglob pattern here */
-! /* if pe != se we have more of the pattern at the end of the extglob
-! pattern. Check the easy case first ( */
-! if (pe == se && *pe == ')' && (t = strchr (pp, '|')) == 0)
- {
- *pe = '\0';
-+ #if defined (HANDLE_MULTIBYTE)
-+ r = mbskipname (pp, dname, flags);
-+ #else
- r = skipname (pp, dname, flags); /*(*/
-+ #endif
- *pe = ')';
- return r;
- }
-+
-+ /* check every subpattern */
- while (t = glob_patscan (pp, pe, '|'))
- {
- n = t[-1];
- t[-1] = '\0';
-+ #if defined (HANDLE_MULTIBYTE)
-+ r = mbskipname (pp, dname, flags);
-+ #else
- r = skipname (pp, dname, flags);
-+ #endif
- t[-1] = n;
- if (r == 0) /* if any pattern says not skip, we don't skip */
-***************
-*** 205,219 ****
- } /*(*/
-
-! if (pp == pe) /* glob_patscan might find end of pattern */
- return r;
-
-! *pe = '\0';
-! # if defined (HANDLE_MULTIBYTE)
-! r = mbskipname (pp, dname, flags); /*(*/
-! # else
-! r = skipname (pp, dname, flags); /*(*/
-! # endif
-! *pe = ')';
-! return r;
- }
- #endif
---- 218,227 ----
- } /*(*/
-
-! /* glob_patscan might find end of pattern */
-! if (pp == se)
- return r;
-
-! /* but if it doesn't then we didn't match a leading dot */
-! return 0;
- }
- #endif
-***************
-*** 278,289 ****
- {
- #if EXTENDED_GLOB
-! wchar_t *pp, *pe, *t, n;
-! int r;
-
- pp = pat + 2;
-! pe = pp + wcslen (pp) - 1; /*(*/
-! if (*pe != L')')
-! return 0;
-! if ((t = wcschr (pp, L'|')) == 0)
- {
- *pe = L'\0';
---- 286,298 ----
- {
- #if EXTENDED_GLOB
-! wchar_t *pp, *pe, *t, n, *se;
-! int r, negate;
-
-+ negate = *pat == L'!';
- pp = pat + 2;
-! se = pp + wcslen (pp) - 1; /*(*/
-! pe = glob_patscan_wc (pp, se, 0);
-!
-! if (pe == se && *pe == ')' && (t = wcschr (pp, L'|')) == 0)
- {
- *pe = L'\0';
-***************
-*** 292,295 ****
---- 301,306 ----
- return r;
- }
-+
-+ /* check every subpattern */
- while (t = glob_patscan_wc (pp, pe, '|'))
- {
-***************
-*** 306,313 ****
- return r;
-
-! *pe = L'\0';
-! r = wchkname (pp, dname); /*(*/
-! *pe = L')';
-! return r;
- #else
- return (wchkname (pat, dname));
---- 317,322 ----
- return r;
-
-! /* but if it doesn't then we didn't match a leading dot */
-! return 0;
- #else
- return (wchkname (pat, dname));
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 7
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 8
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-009 b/bash/patches/bash43-009
deleted file mode 100644
index 015835c..0000000
--- a/bash/patches/bash43-009
+++ /dev/null
@@ -1,64 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-009
-
-Bug-Reported-by: Matthias Klose <doko(a)debian.org>
-Bug-Reference-ID: <53346FC8.6090005(a)debian.org>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00171.html
-
-Bug-Description:
-
-There is a problem with unsigned sign extension when attempting to reallocate
-the input line when it is fewer than 3 characters long and there has been a
-history expansion. The sign extension causes the shell to not reallocate the
-line, which results in a segmentation fault when it writes past the end.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/parse.y 2014-02-11 09:42:10.000000000 -0500
---- parse.y 2014-03-27 16:33:29.000000000 -0400
-***************
-*** 2425,2429 ****
- if (shell_input_line_terminator != EOF)
- {
-! if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3)
- shell_input_line = (char *)xrealloc (shell_input_line,
- 1 + (shell_input_line_size += 2));
---- 2425,2429 ----
- if (shell_input_line_terminator != EOF)
- {
-! if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
- shell_input_line = (char *)xrealloc (shell_input_line,
- 1 + (shell_input_line_size += 2));
-*** ../bash-4.3-patched/y.tab.c 2014-03-28 11:17:06.000000000 -0400
---- y.tab.c 2014-04-07 11:48:31.000000000 -0400
-***************
-*** 4737,4741 ****
- if (shell_input_line_terminator != EOF)
- {
-! if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3)
- shell_input_line = (char *)xrealloc (shell_input_line,
- 1 + (shell_input_line_size += 2));
---- 4737,4741 ----
- if (shell_input_line_terminator != EOF)
- {
-! if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
- shell_input_line = (char *)xrealloc (shell_input_line,
- 1 + (shell_input_line_size += 2));
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 8
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 9
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-010 b/bash/patches/bash43-010
deleted file mode 100644
index 835a96e..0000000
--- a/bash/patches/bash43-010
+++ /dev/null
@@ -1,157 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-010
-
-Bug-Reported-by: Albert Shih <Albert.Shih(a)obspm.fr>
-Bug-Reference-ID: Wed, 5 Mar 2014 23:01:40 +0100
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00028.html
-
-Bug-Description:
-
-Patch (apply with `patch -p0'):
-
-This patch changes the behavior of programmable completion to compensate
-for two assumptions made by the bash-completion package. Bash-4.3 changed
-to dequote the argument to programmable completion only under certain
-circumstances, to make the behavior of compgen more consistent when run
-from the command line -- closer to the behavior when run by a shell function
-run as part of programmable completion. Bash-completion can pass quoted
-arguments to compgen when the original word to be completed was not quoted,
-expecting programmable completion to dequote the word before attempting
-completion.
-
-This patch fixes two cases:
-
-1. An empty string that bash-completion passes to compgen as a quoted null
- string ('').
-
-2. An unquoted word that bash-completion quotes using single quotes or
- backslashes before passing it to compgen.
-
-In these cases, since readline did not detect a quote character in the original
-word to be completed, bash-4.3
-
-*** ../bash-4.3/externs.h 2014-01-02 14:58:20.000000000 -0500
---- externs.h 2014-03-13 14:42:57.000000000 -0400
-***************
-*** 325,328 ****
---- 325,329 ----
- extern char *sh_backslash_quote_for_double_quotes __P((char *));
- extern int sh_contains_shell_metas __P((char *));
-+ extern int sh_contains_quotes __P((char *));
-
- /* declarations for functions defined in lib/sh/spell.c */
-*** ../bash-4.3/lib/sh/shquote.c 2013-03-31 21:53:32.000000000 -0400
---- lib/sh/shquote.c 2014-03-13 14:42:57.000000000 -0400
-***************
-*** 312,313 ****
---- 312,327 ----
- return (0);
- }
-+
-+ int
-+ sh_contains_quotes (string)
-+ char *string;
-+ {
-+ char *s;
-+
-+ for (s = string; s && *s; s++)
-+ {
-+ if (*s == '\'' || *s == '"' || *s == '\\')
-+ return 1;
-+ }
-+ return 0;
-+ }
-*** ../bash-4.3/pcomplete.c 2013-08-26 15:23:45.000000000 -0400
---- pcomplete.c 2014-03-25 17:23:23.000000000 -0400
-***************
-*** 184,187 ****
---- 184,188 ----
- COMPSPEC *pcomp_curcs;
- const char *pcomp_curcmd;
-+ const char *pcomp_curtxt;
-
- #ifdef DEBUG
-***************
-*** 754,757 ****
---- 755,784 ----
- dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
- }
-+ /* Intended to solve a mismatched assumption by bash-completion. If
-+ the text to be completed is empty, but bash-completion turns it into
-+ a quoted string ('') assuming that this code will dequote it before
-+ calling readline, do the dequoting. */
-+ else if (iscompgen && iscompleting &&
-+ pcomp_curtxt && *pcomp_curtxt == 0 &&
-+ text && (*text == '\'' || *text == '"') && text[1] == text[0] && text[2] == 0 &&
-+ rl_filename_dequoting_function)
-+ dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
-+ /* Another mismatched assumption by bash-completion. If compgen is being
-+ run as part of bash-completion, and the argument to compgen is not
-+ the same as the word originally passed to the programmable completion
-+ code, dequote the argument if it has quote characters. It's an
-+ attempt to detect when bash-completion is quoting its filename
-+ argument before calling compgen. */
-+ /* We could check whether gen_shell_function_matches is in the call
-+ stack by checking whether the gen-shell-function-matches tag is in
-+ the unwind-protect stack, but there's no function to do that yet.
-+ We could simply check whether we're executing in a function by
-+ checking variable_context, and may end up doing that. */
-+ else if (iscompgen && iscompleting && rl_filename_dequoting_function &&
-+ pcomp_curtxt && text &&
-+ STREQ (pcomp_curtxt, text) == 0 &&
-+ variable_context &&
-+ sh_contains_quotes (text)) /* guess */
-+ dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
- else
- dfn = savestring (text);
-***************
-*** 1523,1527 ****
- {
- COMPSPEC *cs, *oldcs;
-! const char *oldcmd;
- STRINGLIST *ret;
-
---- 1550,1554 ----
- {
- COMPSPEC *cs, *oldcs;
-! const char *oldcmd, *oldtxt;
- STRINGLIST *ret;
-
-***************
-*** 1546,1552 ****
---- 1573,1581 ----
- oldcs = pcomp_curcs;
- oldcmd = pcomp_curcmd;
-+ oldtxt = pcomp_curtxt;
-
- pcomp_curcs = cs;
- pcomp_curcmd = cmd;
-+ pcomp_curtxt = word;
-
- ret = gen_compspec_completions (cs, cmd, word, start, end, foundp);
-***************
-*** 1554,1557 ****
---- 1583,1587 ----
- pcomp_curcs = oldcs;
- pcomp_curcmd = oldcmd;
-+ pcomp_curtxt = oldtxt;
-
- /* We need to conditionally handle setting *retryp here */
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 9
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 10
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-011 b/bash/patches/bash43-011
deleted file mode 100644
index cdc1572..0000000
--- a/bash/patches/bash43-011
+++ /dev/null
@@ -1,49 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-011
-
-Bug-Reported-by: Egmont Koblinger <egmont(a)gmail.com>
-Bug-Reference-ID: <CAGWcZk+bU5Jo1M+tutGvL-250UBE9DXjpeJVofYJSFcqFEVfMg(a)mail.gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00153.html
-
-Bug-Description:
-
-The signal handling changes to bash and readline (to avoid running any code
-in a signal handler context) cause the cursor to be placed on the wrong
-line of a multi-line command after a ^C interrupts editing.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/lib/readline/display.c 2013-12-27 13:10:56.000000000 -0500
---- lib/readline/display.c 2014-03-27 11:52:45.000000000 -0400
-***************
-*** 2678,2682 ****
- if (_rl_echoing_p)
- {
-! _rl_move_vert (_rl_vis_botlin);
- _rl_vis_botlin = 0;
- fflush (rl_outstream);
---- 2678,2683 ----
- if (_rl_echoing_p)
- {
-! if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */
-! _rl_move_vert (_rl_vis_botlin);
- _rl_vis_botlin = 0;
- fflush (rl_outstream);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 10
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 11
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-012 b/bash/patches/bash43-012
deleted file mode 100644
index 176fa15..0000000
--- a/bash/patches/bash43-012
+++ /dev/null
@@ -1,43 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-012
-
-Bug-Reported-by: Eduardo A. Bustamante López<dualbus(a)gmail.com>
-Bug-Reference-ID: <5346B54C.4070205(a)case.edu>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00051.html
-
-Bug-Description:
-
-When a SIGCHLD trap runs a command containing a shell builtin while
-a script is running `wait' to wait for all running children to complete,
-the SIGCHLD trap will not be run once for each child that terminates.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/jobs.c 2014-03-28 10:54:19.000000000 -0400
---- jobs.c 2014-04-15 08:47:03.000000000 -0400
-***************
-*** 3598,3601 ****
---- 3598,3602 ----
- unwind_protect_pointer (the_pipeline);
- unwind_protect_pointer (subst_assign_varlist);
-+ unwind_protect_pointer (this_shell_builtin);
-
- /* We have to add the commands this way because they will be run
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 11
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 12
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-013 b/bash/patches/bash43-013
deleted file mode 100644
index 8f4006b..0000000
--- a/bash/patches/bash43-013
+++ /dev/null
@@ -1,66 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-013
-
-Bug-Reported-by: <Trond.Endrestol(a)ximalas.info>
-Bug-Reference-ID: <alpine.BSF.2.03.1404192114310.1973(a)enterprise.ximalas.info>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00069.html
-
-Bug-Description:
-
-Using reverse-i-search when horizontal scrolling is enabled does not redisplay
-the entire line containing the successful search results.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/lib/readline/display.c 2014-04-08 18:19:36.000000000 -0400
---- lib/readline/display.c 2014-04-20 18:32:52.000000000 -0400
-***************
-*** 1638,1642 ****
- the spot of first difference is before the end of the invisible chars,
- lendiff needs to be adjusted. */
-! if (current_line == 0 && !_rl_horizontal_scroll_mode &&
- current_invis_chars != visible_wrap_offset)
- {
---- 1638,1642 ----
- the spot of first difference is before the end of the invisible chars,
- lendiff needs to be adjusted. */
-! if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
- current_invis_chars != visible_wrap_offset)
- {
-***************
-*** 1826,1831 ****
- _rl_last_c_pos += bytes_to_insert;
-
- if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
-! goto clear_rest_of_line;
- }
- }
---- 1826,1836 ----
- _rl_last_c_pos += bytes_to_insert;
-
-+ /* XXX - we only want to do this if we are at the end of the line
-+ so we move there with _rl_move_cursor_relative */
- if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
-! {
-! _rl_move_cursor_relative (ne-new, new);
-! goto clear_rest_of_line;
-! }
- }
- }
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 12
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 13
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-014 b/bash/patches/bash43-014
deleted file mode 100644
index f837196..0000000
--- a/bash/patches/bash43-014
+++ /dev/null
@@ -1,102 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-014
-
-Bug-Reported-by: Greg Wooledge <wooledg(a)eeg.ccf.org>
-Bug-Reference-ID: <20140418202123.GB7660(a)eeg.ccf.org>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/help-bash/2014-04/msg00004.html
-
-Bug-Description:
-
-Under certain circumstances, $@ is expanded incorrectly in contexts where
-word splitting is not performed.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/subst.c 2014-01-23 16:26:37.000000000 -0500
---- subst.c 2014-04-19 15:41:26.000000000 -0400
-***************
-*** 3249,3254 ****
---- 3249,3256 ----
- return ((char *)NULL);
-
-+ expand_no_split_dollar_star = 1;
- w->flags |= W_NOSPLIT2;
- l = call_expand_word_internal (w, 0, 0, (int *)0, (int *)0);
-+ expand_no_split_dollar_star = 0;
- if (l)
- {
-***************
-*** 7848,7851 ****
---- 7850,7857 ----
- according to POSIX.2, this expands to a list of the positional
- parameters no matter what IFS is set to. */
-+ /* XXX - what to do when in a context where word splitting is not
-+ performed? Even when IFS is not the default, posix seems to imply
-+ that we behave like unquoted $* ? Maybe we should use PF_NOSPLIT2
-+ here. */
- temp = string_list_dollar_at (list, (pflags & PF_ASSIGNRHS) ? (quoted|Q_DOUBLE_QUOTES) : quoted);
-
-***************
-*** 8817,8820 ****
---- 8823,8827 ----
- {
- char *ifs_chars;
-+ char *tstring;
-
- ifs_chars = (quoted_dollar_at || has_dollar_at) ? ifs_value : (char *)NULL;
-***************
-*** 8831,8834 ****
---- 8838,8865 ----
- if (split_on_spaces)
- list = list_string (istring, " ", 1); /* XXX quoted == 1? */
-+ /* If we have $@ (has_dollar_at != 0) and we are in a context where we
-+ don't want to split the result (W_NOSPLIT2), and we are not quoted,
-+ we have already separated the arguments with the first character of
-+ $IFS. In this case, we want to return a list with a single word
-+ with the separator possibly replaced with a space (it's what other
-+ shells seem to do).
-+ quoted_dollar_at is internal to this function and is set if we are
-+ passed an argument that is unquoted (quoted == 0) but we encounter a
-+ double-quoted $@ while expanding it. */
-+ else if (has_dollar_at && quoted_dollar_at == 0 && ifs_chars && quoted == 0 && (word->flags & W_NOSPLIT2))
-+ {
-+ /* Only split and rejoin if we have to */
-+ if (*ifs_chars && *ifs_chars != ' ')
-+ {
-+ list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1);
-+ tstring = string_list (list);
-+ }
-+ else
-+ tstring = istring;
-+ tword = make_bare_word (tstring);
-+ if (tstring != istring)
-+ free (tstring);
-+ goto set_word_flags;
-+ }
- else if (has_dollar_at && ifs_chars)
- list = list_string (istring, *ifs_chars ? ifs_chars : " ", 1);
-***************
-*** 8836,8839 ****
---- 8867,8871 ----
- {
- tword = make_bare_word (istring);
-+ set_word_flags:
- if ((quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) || (quoted_state == WHOLLY_QUOTED))
- tword->flags |= W_QUOTED;
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 13
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 14
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-015 b/bash/patches/bash43-015
deleted file mode 100644
index 9c4e5ea..0000000
--- a/bash/patches/bash43-015
+++ /dev/null
@@ -1,58 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-015
-
-Bug-Reported-by: Clark Wang <dearvoid(a)gmail.com>
-Bug-Reference-ID: <CADv8-og2TOSoabXeNVXVGaXN3tEMHnYVq1rwOLe5meaRPSGRig(a)mail.gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00095.html
-
-Bug-Description:
-
-When completing directory names, the directory name is dequoted twice.
-This causes problems for directories with single and double quotes in
-their names.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/bashline.c 2014-02-09 19:56:58.000000000 -0500
---- bashline.c 2014-04-25 14:57:52.000000000 -0400
-***************
-*** 4168,4174 ****
-
- qc = rl_dispatching ? rl_completion_quote_character : 0;
-! dfn = bash_dequote_filename ((char *)text, qc);
- m1 = rl_completion_matches (dfn, rl_filename_completion_function);
-! free (dfn);
-
- if (m1 == 0 || m1[0] == 0)
---- 4209,4222 ----
-
- qc = rl_dispatching ? rl_completion_quote_character : 0;
-! /* If rl_completion_found_quote != 0, rl_completion_matches will call the
-! filename dequoting function, causing the directory name to be dequoted
-! twice. */
-! if (rl_dispatching && rl_completion_found_quote == 0)
-! dfn = bash_dequote_filename ((char *)text, qc);
-! else
-! dfn = (char *)text;
- m1 = rl_completion_matches (dfn, rl_filename_completion_function);
-! if (dfn != text)
-! free (dfn);
-
- if (m1 == 0 || m1[0] == 0)
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 14
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 15
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-016 b/bash/patches/bash43-016
deleted file mode 100644
index 882d593..0000000
--- a/bash/patches/bash43-016
+++ /dev/null
@@ -1,132 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-016
-
-Bug-Reported-by: Pierre Gaston <pierre.gaston(a)gmail.com>
-Bug-Reference-ID: <CAPSX3sTCD61k1VQLJ5r-LWzEt+e7Xc-fxXmwn2u8EA5gJJej8Q(a)mail.gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00100.html
-
-Bug-Description:
-
-An extended glob pattern containing a slash (`/') causes the globbing code
-to misinterpret it as a directory separator.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/lib/glob/glob.c 2014-03-28 10:54:23.000000000 -0400
---- lib/glob/glob.c 2014-05-02 10:24:28.000000000 -0400
-***************
-*** 124,127 ****
---- 124,129 ----
- extern wchar_t *glob_patscan_wc __P((wchar_t *, wchar_t *, int));
-
-+ extern char *glob_dirscan __P((char *, int));
-+
- /* Compile `glob_loop.c' for single-byte characters. */
- #define CHAR unsigned char
-***************
-*** 188,191 ****
---- 190,196 ----
- pe = glob_patscan (pp, se, 0); /* end of extglob pattern (( */
- /* we should check for invalid extglob pattern here */
-+ if (pe == 0)
-+ return 0;
-+
- /* if pe != se we have more of the pattern at the end of the extglob
- pattern. Check the easy case first ( */
-***************
-*** 1016,1020 ****
- char **result;
- unsigned int result_size;
-! char *directory_name, *filename, *dname;
- unsigned int directory_len;
- int free_dirname; /* flag */
---- 1021,1025 ----
- char **result;
- unsigned int result_size;
-! char *directory_name, *filename, *dname, *fn;
- unsigned int directory_len;
- int free_dirname; /* flag */
-***************
-*** 1032,1035 ****
---- 1037,1052 ----
- /* Find the filename. */
- filename = strrchr (pathname, '/');
-+ #if defined (EXTENDED_GLOB)
-+ if (filename && extended_glob)
-+ {
-+ fn = glob_dirscan (pathname, '/');
-+ #if DEBUG_MATCHING
-+ if (fn != filename)
-+ fprintf (stderr, "glob_filename: glob_dirscan: fn (%s) != filename (%s)\n", fn ? fn : "(null)", filename);
-+ #endif
-+ filename = fn;
-+ }
-+ #endif
-+
- if (filename == NULL)
- {
-*** ../bash-4.3-patched/lib/glob/gmisc.c 2014-03-28 10:54:23.000000000 -0400
---- lib/glob/gmisc.c 2014-05-02 09:35:57.000000000 -0400
-***************
-*** 43,46 ****
---- 43,48 ----
- #define WRPAREN L')'
-
-+ extern char *glob_patscan __P((char *, char *, int));
-+
- /* Return 1 of the first character of WSTRING could match the first
- character of pattern WPAT. Wide character version. */
-***************
-*** 376,377 ****
---- 378,410 ----
- return matlen;
- }
-+
-+ /* Skip characters in PAT and return the final occurrence of DIRSEP. This
-+ is only called when extended_glob is set, so we have to skip over extglob
-+ patterns x(...) */
-+ char *
-+ glob_dirscan (pat, dirsep)
-+ char *pat;
-+ int dirsep;
-+ {
-+ char *p, *d, *pe, *se;
-+
-+ d = pe = se = 0;
-+ for (p = pat; p && *p; p++)
-+ {
-+ if (extglob_pattern_p (p))
-+ {
-+ if (se == 0)
-+ se = p + strlen (p) - 1;
-+ pe = glob_patscan (p + 2, se, 0);
-+ if (pe == 0)
-+ continue;
-+ else if (*pe == 0)
-+ break;
-+ p = pe - 1; /* will do increment above */
-+ continue;
-+ }
-+ if (*p == dirsep)
-+ d = p;
-+ }
-+ return d;
-+ }
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 15
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 16
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-017 b/bash/patches/bash43-017
deleted file mode 100644
index 4016fb9..0000000
--- a/bash/patches/bash43-017
+++ /dev/null
@@ -1,51 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-017
-
-Bug-Reported-by: Dan Douglas <ormaaj(a)gmail.com>
-Bug-Reference-ID: <7781746.RhfoTROLxF@smorgbox>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-05/msg00026.html
-
-Bug-Description:
-
-The code that creates local variables should not clear the `invisible'
-attribute when returning an existing local variable. Let the code that
-actually assigns a value clear it.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/variables.c 2014-02-14 11:55:12.000000000 -0500
---- variables.c 2014-05-07 10:53:57.000000000 -0400
-***************
-*** 2198,2205 ****
- old_var = find_variable (name);
- if (old_var && local_p (old_var) && old_var->context == variable_context)
-! {
-! VUNSETATTR (old_var, att_invisible); /* XXX */
-! return (old_var);
-! }
-
- was_tmpvar = old_var && tempvar_p (old_var);
---- 2260,2264 ----
- old_var = find_variable (name);
- if (old_var && local_p (old_var) && old_var->context == variable_context)
-! return (old_var);
-
- was_tmpvar = old_var && tempvar_p (old_var);
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 16
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 17
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-018 b/bash/patches/bash43-018
deleted file mode 100644
index 39499f6..0000000
--- a/bash/patches/bash43-018
+++ /dev/null
@@ -1,44 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-018
-
-Bug-Reported-by: Geir Hauge <geir.hauge(a)gmail.com>
-Bug-Reference-ID: <CAO-BiTLOvfPXDypg61jcBausADrxUKJejakV2WTWP26cW0=rgA(a)mail.gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-05/msg00040.html
-
-Bug-Description:
-
-When assigning an array variable using the compound assignment syntax,
-but using `declare' with the rhs of the compound assignment quoted, the
-shell did not mark the variable as visible after successfully performing
-the assignment.
-
-Patch (apply with `patch -p0'):
-*** ../bash-4.3-patched/arrayfunc.c 2014-03-28 10:54:21.000000000 -0400
---- arrayfunc.c 2014-05-12 11:19:00.000000000 -0400
-***************
-*** 180,183 ****
---- 180,184 ----
- FREE (newval);
-
-+ VUNSETATTR (entry, att_invisible); /* no longer invisible */
- return (entry);
- }
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 17
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 18
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-019 b/bash/patches/bash43-019
deleted file mode 100644
index a93714b..0000000
--- a/bash/patches/bash43-019
+++ /dev/null
@@ -1,84 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-019
-
-Bug-Reported-by: John Lenton
-Bug-Reference-ID:
-Bug-Reference-URL: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1317476
-
-Bug-Description:
-
-The -t timeout option to `read' does not work when the -e option is used.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/lib/readline/input.c 2014-01-10 15:07:08.000000000 -0500
---- lib/readline/input.c 2014-05-22 18:40:59.000000000 -0400
-***************
-*** 535,540 ****
---- 538,551 ----
- else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)
- return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
-+ /* keyboard-generated signals of interest */
- else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT)
- RL_CHECK_SIGNALS ();
-+ /* non-keyboard-generated signals of interest */
-+ else if (_rl_caught_signal == SIGALRM
-+ #if defined (SIGVTALRM)
-+ || _rl_caught_signal == SIGVTALRM
-+ #endif
-+ )
-+ RL_CHECK_SIGNALS ();
-
- if (rl_signal_event_hook)
-*** ../bash-4.3-patched/builtins/read.def 2013-09-02 11:54:00.000000000 -0400
---- builtins/read.def 2014-05-08 11:43:35.000000000 -0400
-***************
-*** 443,447 ****
- #if defined (READLINE)
- if (edit)
-! add_unwind_protect (reset_attempted_completion_function, (char *)NULL);
- #endif
- falarm (tmsec, tmusec);
---- 443,450 ----
- #if defined (READLINE)
- if (edit)
-! {
-! add_unwind_protect (reset_attempted_completion_function, (char *)NULL);
-! add_unwind_protect (bashline_reset_event_hook, (char *)NULL);
-! }
- #endif
- falarm (tmsec, tmusec);
-***************
-*** 1022,1025 ****
---- 1025,1029 ----
- old_attempted_completion_function = rl_attempted_completion_function;
- rl_attempted_completion_function = (rl_completion_func_t *)NULL;
-+ bashline_set_event_hook ();
- if (itext)
- {
-***************
-*** 1033,1036 ****
---- 1037,1041 ----
- rl_attempted_completion_function = old_attempted_completion_function;
- old_attempted_completion_function = (rl_completion_func_t *)NULL;
-+ bashline_reset_event_hook ();
-
- if (ret == 0)
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 18
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 19
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-020 b/bash/patches/bash43-020
deleted file mode 100644
index 5f533ef..0000000
--- a/bash/patches/bash43-020
+++ /dev/null
@@ -1,110 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-020
-
-Bug-Reported-by: Jared Yanovich <slovichon(a)gmail.com>
-Bug-Reference-ID: <20140417073654.GB26875(a)nightderanger.psc.edu>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00065.html
-
-Bug-Description:
-
-When PS2 contains a command substitution, here-documents entered in an
-interactive shell can sometimes cause a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/shell.h 2012-12-25 21:11:01.000000000 -0500
---- shell.h 2014-06-03 09:24:28.000000000 -0400
-***************
-*** 169,173 ****
- int expand_aliases;
- int echo_input_at_read;
-!
- } sh_parser_state_t;
-
---- 169,174 ----
- int expand_aliases;
- int echo_input_at_read;
-! int need_here_doc;
-!
- } sh_parser_state_t;
-
-*** ../bash-4.3-patched/parse.y 2014-05-14 09:16:40.000000000 -0400
---- parse.y 2014-04-30 09:27:59.000000000 -0400
-***************
-*** 2643,2647 ****
-
- r = 0;
-! while (need_here_doc)
- {
- parser_state |= PST_HEREDOC;
---- 2643,2647 ----
-
- r = 0;
-! while (need_here_doc > 0)
- {
- parser_state |= PST_HEREDOC;
-***************
-*** 6076,6079 ****
---- 6076,6080 ----
- ps->expand_aliases = expand_aliases;
- ps->echo_input_at_read = echo_input_at_read;
-+ ps->need_here_doc = need_here_doc;
-
- ps->token = token;
-***************
-*** 6124,6127 ****
---- 6125,6129 ----
- expand_aliases = ps->expand_aliases;
- echo_input_at_read = ps->echo_input_at_read;
-+ need_here_doc = ps->need_here_doc;
-
- FREE (token);
-*** ../bash-4.3-patched/y.tab.c 2014-04-07 11:56:12.000000000 -0400
---- y.tab.c 2014-07-30 09:55:57.000000000 -0400
-***************
-*** 4955,4959 ****
-
- r = 0;
-! while (need_here_doc)
- {
- parser_state |= PST_HEREDOC;
---- 5151,5155 ----
-
- r = 0;
-! while (need_here_doc > 0)
- {
- parser_state |= PST_HEREDOC;
-***************
-*** 8388,8391 ****
---- 8584,8588 ----
- ps->expand_aliases = expand_aliases;
- ps->echo_input_at_read = echo_input_at_read;
-+ ps->need_here_doc = need_here_doc;
-
- ps->token = token;
-***************
-*** 8436,8439 ****
---- 8633,8637 ----
- expand_aliases = ps->expand_aliases;
- echo_input_at_read = ps->echo_input_at_read;
-+ need_here_doc = ps->need_here_doc;
-
- FREE (token);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 19
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 20
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-021 b/bash/patches/bash43-021
deleted file mode 100644
index fd1c945..0000000
--- a/bash/patches/bash43-021
+++ /dev/null
@@ -1,52 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-021
-
-Bug-Reported-by: Jared Yanovich <slovichon(a)gmail.com>
-Bug-Reference-ID: <20140625225019.GJ17044(a)nightderanger.psc.edu>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html
-
-Bug-Description:
-
-When the readline `revert-all-at-newline' option is set, pressing newline
-when the current line is one retrieved from history results in a double free
-and a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/lib/readline/misc.c 2012-09-01 18:03:11.000000000 -0400
---- lib/readline/misc.c 2014-06-30 13:41:19.000000000 -0400
-***************
-*** 462,465 ****
---- 462,466 ----
- /* Set up rl_line_buffer and other variables from history entry */
- rl_replace_from_history (entry, 0); /* entry->line is now current */
-+ entry->data = 0; /* entry->data is now current undo list */
- /* Undo all changes to this history entry */
- while (rl_undo_list)
-***************
-*** 469,473 ****
- FREE (entry->line);
- entry->line = savestring (rl_line_buffer);
-- entry->data = 0;
- }
- entry = previous_history ();
---- 470,473 ----
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 20
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 21
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-022 b/bash/patches/bash43-022
deleted file mode 100644
index 7ce39ec..0000000
--- a/bash/patches/bash43-022
+++ /dev/null
@@ -1,56 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-022
-
-Bug-Reported-by: scorp.dev.null(a)gmail.com
-Bug-Reference-ID: <E1WxXw8-0007iE-Bi@pcm14>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00061.html
-
-Bug-Description:
-
-Using nested pipelines within loops with the `lastpipe' option set can result
-in a segmentation fault.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/execute_cmd.c 2014-01-31 10:54:52.000000000 -0500
---- execute_cmd.c 2014-06-19 08:05:49.000000000 -0400
-***************
-*** 2410,2414 ****
- lstdin = wait_for (lastpid);
- #if defined (JOB_CONTROL)
-! exec_result = job_exit_status (lastpipe_jid);
- #endif
- unfreeze_jobs_list ();
---- 2425,2438 ----
- lstdin = wait_for (lastpid);
- #if defined (JOB_CONTROL)
-! /* If wait_for removes the job from the jobs table, use result of last
-! command as pipeline's exit status as usual. The jobs list can get
-! frozen and unfrozen at inconvenient times if there are multiple pipelines
-! running simultaneously. */
-! if (INVALID_JOB (lastpipe_jid) == 0)
-! exec_result = job_exit_status (lastpipe_jid);
-! else if (pipefail_opt)
-! exec_result = exec_result | lstdin; /* XXX */
-! /* otherwise we use exec_result */
-!
- #endif
- unfreeze_jobs_list ();
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 21
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 22
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-023 b/bash/patches/bash43-023
deleted file mode 100644
index d1e4e9d..0000000
--- a/bash/patches/bash43-023
+++ /dev/null
@@ -1,104 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-023
-
-Bug-Reported-by: Tim Friske <me(a)timfriske.com>
-Bug-Reference-ID: <CAM1RzOcOR9zzC2i+aeES6LtbHNHoOV+0pZEYPrqxv_QAii-RXA(a)mail.gmail.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00056.html
-
-Bug-Description:
-
-Bash does not correctly parse process substitution constructs that contain
-unbalanced parentheses as part of the contained command.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/subst.h 2014-01-11 21:02:27.000000000 -0500
---- subst.h 2014-07-20 17:25:01.000000000 -0400
-***************
-*** 83,87 ****
- Start extracting at (SINDEX) as if we had just seen "<(".
- Make (SINDEX) get the position just after the matching ")". */
-! extern char *extract_process_subst __P((char *, char *, int *));
- #endif /* PROCESS_SUBSTITUTION */
-
---- 83,87 ----
- Start extracting at (SINDEX) as if we had just seen "<(".
- Make (SINDEX) get the position just after the matching ")". */
-! extern char *extract_process_subst __P((char *, char *, int *, int));
- #endif /* PROCESS_SUBSTITUTION */
-
-*** ../bash-4.3-patched/subst.c 2014-05-15 08:26:45.000000000 -0400
---- subst.c 2014-07-20 17:26:44.000000000 -0400
-***************
-*** 1193,1202 ****
- Make (SINDEX) get the position of the matching ")". */ /*))*/
- char *
-! extract_process_subst (string, starter, sindex)
- char *string;
- char *starter;
- int *sindex;
- {
- return (extract_delimited_string (string, sindex, starter, "(", ")", SX_COMMAND));
- }
- #endif /* PROCESS_SUBSTITUTION */
---- 1193,1208 ----
- Make (SINDEX) get the position of the matching ")". */ /*))*/
- char *
-! extract_process_subst (string, starter, sindex, xflags)
- char *string;
- char *starter;
- int *sindex;
-+ int xflags;
- {
-+ #if 0
- return (extract_delimited_string (string, sindex, starter, "(", ")", SX_COMMAND));
-+ #else
-+ xflags |= (no_longjmp_on_fatal_error ? SX_NOLONGJMP : 0);
-+ return (xparse_dolparen (string, string+*sindex, sindex, xflags));
-+ #endif
- }
- #endif /* PROCESS_SUBSTITUTION */
-***************
-*** 1786,1790 ****
- if (string[si] == '\0')
- CQ_RETURN(si);
-! temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si);
- free (temp); /* no SX_ALLOC here */
- i = si;
---- 1792,1796 ----
- if (string[si] == '\0')
- CQ_RETURN(si);
-! temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si, 0);
- free (temp); /* no SX_ALLOC here */
- i = si;
-***************
-*** 8250,8254 ****
- t_index = sindex + 1; /* skip past both '<' and LPAREN */
-
-! temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(", &t_index); /*))*/
- sindex = t_index;
-
---- 8256,8260 ----
- t_index = sindex + 1; /* skip past both '<' and LPAREN */
-
-! temp1 = extract_process_subst (string, (c == '<') ? "<(" : ">(", &t_index, 0); /*))*/
- sindex = t_index;
-
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 22
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 23
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-024 b/bash/patches/bash43-024
deleted file mode 100644
index a24b8fb..0000000
--- a/bash/patches/bash43-024
+++ /dev/null
@@ -1,54 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-024
-
-Bug-Reported-by: Corentin Peuvrel <cpeuvrel(a)pom-monitoring.com>
-Bug-Reference-ID: <53CE9E5D.6050203(a)pom-monitoring.com>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-07/msg00021.html
-
-Bug-Description:
-
-Indirect variable references do not work correctly if the reference
-variable expands to an array reference using a subscript other than 0
-(e.g., foo='bar[1]' ; echo ${!foo}).
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/subst.c 2014-06-03 09:32:44.000000000 -0400
---- subst.c 2014-07-23 09:58:19.000000000 -0400
-***************
-*** 7375,7379 ****
-
- if (want_indir)
-! tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
- else
- tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
---- 7445,7455 ----
-
- if (want_indir)
-! {
-! tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at);
-! /* Turn off the W_ARRAYIND flag because there is no way for this function
-! to return the index we're supposed to be using. */
-! if (tdesc && tdesc->flags)
-! tdesc->flags &= ~W_ARRAYIND;
-! }
- else
- tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&(PF_NOSPLIT2|PF_ASSIGNRHS)), &ind);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 23
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 24
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-025 b/bash/patches/bash43-025
deleted file mode 100644
index 721aca0..0000000
--- a/bash/patches/bash43-025
+++ /dev/null
@@ -1,123 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-025
-
-Bug-Reported-by: Stephane Chazelas <stephane.chazelas(a)gmail.com>
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-Under certain circumstances, bash will execute user code while processing the
-environment for exported function definitions.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3-patched/builtins/common.h 2013-07-08 16:54:47.000000000 -0400
---- builtins/common.h 2014-09-12 14:25:47.000000000 -0400
-***************
-*** 34,37 ****
---- 49,54 ----
- #define SEVAL_PARSEONLY 0x020
- #define SEVAL_NOLONGJMP 0x040
-+ #define SEVAL_FUNCDEF 0x080 /* only allow function definitions */
-+ #define SEVAL_ONECMD 0x100 /* only allow a single command */
-
- /* Flags for describe_command, shared between type.def and command.def */
-*** ../bash-4.3-patched/builtins/evalstring.c 2014-02-11 09:42:10.000000000 -0500
---- builtins/evalstring.c 2014-09-14 14:15:13.000000000 -0400
-***************
-*** 309,312 ****
---- 313,324 ----
- struct fd_bitmap *bitmap;
-
-+ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
-+ {
-+ internal_warning ("%s: ignoring function definition attempt", from_file);
-+ should_jump_to_top_level = 0;
-+ last_result = last_command_exit_value = EX_BADUSAGE;
-+ break;
-+ }
-+
- bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
- begin_unwind_frame ("pe_dispose");
-***************
-*** 369,372 ****
---- 381,387 ----
- dispose_fd_bitmap (bitmap);
- discard_unwind_frame ("pe_dispose");
-+
-+ if (flags & SEVAL_ONECMD)
-+ break;
- }
- }
-*** ../bash-4.3-patched/variables.c 2014-05-15 08:26:50.000000000 -0400
---- variables.c 2014-09-14 14:23:35.000000000 -0400
-***************
-*** 359,369 ****
- strcpy (temp_string + char_index + 1, string);
-
-! if (posixly_correct == 0 || legal_identifier (name))
-! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST);
-!
-! /* Ancient backwards compatibility. Old versions of bash exported
-! functions like name()=() {...} */
-! if (name[char_index - 1] == ')' && name[char_index - 2] == '(')
-! name[char_index - 2] = '\0';
-
- if (temp_var = find_function (name))
---- 364,372 ----
- strcpy (temp_string + char_index + 1, string);
-
-! /* Don't import function names that are invalid identifiers from the
-! environment, though we still allow them to be defined as shell
-! variables. */
-! if (legal_identifier (name))
-! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
-
- if (temp_var = find_function (name))
-***************
-*** 382,389 ****
- report_error (_("error importing function definition for `%s'"), name);
- }
--
-- /* ( */
-- if (name[char_index - 1] == ')' && name[char_index - 2] == '\0')
-- name[char_index - 2] = '('; /* ) */
- }
- #if defined (ARRAY_VARS)
---- 385,388 ----
-*** ../bash-4.3-patched/subst.c 2014-08-11 11:16:35.000000000 -0400
---- subst.c 2014-09-12 15:31:04.000000000 -0400
-***************
-*** 8048,8052 ****
- goto return0;
- }
-! else if (var = find_variable_last_nameref (temp1))
- {
- temp = nameref_cell (var);
---- 8118,8124 ----
- goto return0;
- }
-! else if (var && (invisible_p (var) || var_isset (var) == 0))
-! temp = (char *)NULL;
-! else if ((var = find_variable_last_nameref (temp1)) && var_isset (var) && invisible_p (var) == 0)
- {
- temp = nameref_cell (var);
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 24
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 25
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/bash/patches/bash43-026 b/bash/patches/bash43-026
deleted file mode 100644
index d5d5b1d..0000000
--- a/bash/patches/bash43-026
+++ /dev/null
@@ -1,60 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.3
-Patch-ID: bash43-026
-
-Bug-Reported-by: Tavis Ormandy <taviso(a)cmpxchg8b.com>
-Bug-Reference-ID:
-Bug-Reference-URL: http://twitter.com/taviso/statuses/514887394294652929
-
-Bug-Description:
-
-Under certain circumstances, bash can incorrectly save a lookahead character and
-return it on a subsequent call, even when reading a new line.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.3.25/parse.y 2014-07-30 10:14:31.000000000 -0400
---- parse.y 2014-09-25 20:20:21.000000000 -0400
-***************
-*** 2954,2957 ****
---- 2954,2959 ----
- word_desc_to_read = (WORD_DESC *)NULL;
-
-+ eol_ungetc_lookahead = 0;
-+
- current_token = '\n'; /* XXX */
- last_read_token = '\n';
-*** ../bash-4.3.25/y.tab.c 2014-07-30 10:14:32.000000000 -0400
---- y.tab.c 2014-09-25 20:21:48.000000000 -0400
-***************
-*** 5266,5269 ****
---- 5266,5271 ----
- word_desc_to_read = (WORD_DESC *)NULL;
-
-+ eol_ungetc_lookahead = 0;
-+
- current_token = '\n'; /* XXX */
- last_read_token = '\n';
-***************
-*** 8540,8542 ****
- }
- #endif /* HANDLE_MULTIBYTE */
--
---- 8542,8543 ----
-*** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500
---- patchlevel.h 2014-03-20 20:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 25
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 26
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/binutils/binutils.nm b/binutils/binutils.nm
index e450d79..ea99bce 100644
--- a/binutils/binutils.nm
+++ b/binutils/binutils.nm
@@ -4,7 +4,7 @@
###############################################################################
name = binutils
-version = 2.26
+version = 2.27
release = 1
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
diff --git a/binutils/patches/binutils-2.22.52.0.1-relro-on-by-default.patch b/binutils/patches/binutils-2.22.52.0.1-relro-on-by-default.patch
deleted file mode 100644
index ba8318d..0000000
--- a/binutils/patches/binutils-2.22.52.0.1-relro-on-by-default.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -upr ../binutils-2.22.52.0.1.orig/ld/testsuite/config/default.exp ld/testsuite/config/default.exp
---- a/ld/testsuite/config/default.exp 2012-03-06 14:00:31.141957656 +0000
-+++ b/ld/testsuite/config/default.exp 2012-03-06 14:09:33.492940503 +0000
-@@ -23,7 +23,7 @@
- #
-
- if ![info exists ld] then {
-- set ld [findfile $base_dir/ld-new $base_dir/ld-new [transform ld]]
-+ set ld "[findfile $base_dir/ld-new $base_dir/ld-new [transform ld]] -znorelro"
- }
-
- if ![info exists as] then {
-@@ -60,7 +60,7 @@ if {![file isdirectory tmpdir/ld]} then
- catch "exec ln -s ld tmpdir/ld/collect-ld" status
- catch "exec ln -s ../../../gas/as-new tmpdir/ld/as" status
- }
--set gcc_B_opt "-B[pwd]/tmpdir/ld/"
-+set gcc_B_opt "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro"
-
- # load the linker path
- set ld_L_opt ""
-@@ -279,7 +279,7 @@
- }
-
- if ![info exists LD] then {
-- set LD [findfile $base_dir/ld-new ./ld-new [transform ld]]
-+ set LD "[findfile $base_dir/ld-new ./ld-new [transform ld]] -znorelro"
- }
-
- if ![info exists LDFLAGS] then {
-diff -cpr ../binutils-2.22.52.0.1.orig/ld/testsuite/ld-bootstrap/bootstrap.exp ld/testsuite/ld-bootstrap/bootstrap.exp
---- a/ld/testsuite/ld-bootstrap/bootstrap.exp 2012-03-06 14:00:30.503957676 +0000
-+++ b/ld/testsuite/ld-bootstrap/bootstrap.exp 2012-03-06 15:03:33.949837926 +0000
-@@ -71,7 +71,13 @@
-
- # This test can only be run if we have the ld build directory,
- # since we need the object files.
-- if {$ld != "$objdir/ld-new"} {
-+ set ldexe $ld
-+ set ldparm [string first " " $ld]
-+ if { $ldparm > 0 } then {
-+ set ldparm [expr $ldparm - 1]
-+ set ldexe [string range $ld 0 $ldparm]
-+ }
-+ if {$ldexe != "$objdir/ld-new"} {
- untested $testname
- continue
- }
---- binutils-2.26.orig/ld/emultempl/elf32.em 2016-01-25 10:11:33.990291993 +0000
-+++ binutils-2.26/ld/emultempl/elf32.em 2016-01-25 10:21:40.333016777 +0000
-@@ -104,6 +104,7 @@ gld${EMULATION_NAME}_before_parse (void)
- config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
- config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`;
- `if test -n "$CALL_NOP_BYTE" ; then echo link_info.call_nop_byte = $CALL_NOP_BYTE; fi`;
-+ link_info.relro = TRUE;
- }
-
- EOF
diff --git a/binutils/patches/binutils-2.24-use-relro.patch b/binutils/patches/binutils-2.24-use-relro.patch
deleted file mode 100644
index db3276b..0000000
--- a/binutils/patches/binutils-2.24-use-relro.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-background:
-http://www.airs.com/blog/archives/189
-
---- binutils/ld/ldmain.c
-+++ binutils/ld/ldmain.c
-@@ -293,2 +293,3 @@ main (int argc, char **argv)
- link_info.combreloc = TRUE;
-+ link_info.relro = TRUE;
- link_info.strip_discarded = TRUE;
diff --git a/binutils/patches/binutils-2.26-fix-GOT-offset-calculation.patch b/binutils/patches/binutils-2.26-fix-GOT-offset-calculation.patch
deleted file mode 100644
index 99e8b70..0000000
--- a/binutils/patches/binutils-2.26-fix-GOT-offset-calculation.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- binutils-2.26.orig/bfd/elf32-i386.c 2016-02-29 15:47:45.172597805 +0000
-+++ binutils-2.26/bfd/elf32-i386.c 2016-02-29 15:48:42.161904973 +0000
-@@ -4016,10 +4016,12 @@ elf_i386_relocate_section (bfd *output_b
-
- /* It is relative to .got.plt section. */
- if (h->got.offset != (bfd_vma) -1)
-- /* Use GOT entry. */
-+ /* Use GOT entry. Mask off the least significant bit in
-+ GOT offset which may be set by R_386_GOT32 processing
-+ below. */
- relocation = (htab->elf.sgot->output_section->vma
- + htab->elf.sgot->output_offset
-- + h->got.offset - offplt);
-+ + (h->got.offset & ~1) - offplt);
- else
- /* Use GOTPLT entry. */
- relocation = (h->plt.offset / plt_entry_size - 1 + 3) * 4;
diff --git a/binutils/patches/binutils-2.26-lto.patch b/binutils/patches/binutils-2.26-lto.patch
index 3705459..567f909 100644
--- a/binutils/patches/binutils-2.26-lto.patch
+++ b/binutils/patches/binutils-2.26-lto.patch
@@ -556,58 +556,6 @@ diff -rup binutils-2.26.orig/bfd/section.c binutils-2.26/bfd/section.c
.{* Pointer to the common section. *}
.#define bfd_com_section_ptr (&_bfd_std_section[0])
.{* Pointer to the undefined section. *}
-diff -rup binutils-2.26.orig/binutils/objcopy.c binutils-2.26/binutils/objcopy.c
---- binutils-2.26.orig/binutils/objcopy.c 2016-02-19 09:35:36.287000943 +0000
-+++ binutils-2.26/binutils/objcopy.c 2016-02-19 09:35:54.908106537 +0000
-@@ -1108,30 +1108,6 @@ is_specified_symbol (const char *name, h
- return htab_find (htab, name) != NULL;
- }
-
--/* Return a pointer to the symbol used as a signature for GROUP. */
--
--static asymbol *
--group_signature (asection *group)
--{
-- bfd *abfd = group->owner;
-- Elf_Internal_Shdr *ghdr;
--
-- if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
-- return NULL;
--
-- ghdr = &elf_section_data (group)->this_hdr;
-- if (ghdr->sh_link < elf_numsections (abfd))
-- {
-- const struct elf_backend_data *bed = get_elf_backend_data (abfd);
-- Elf_Internal_Shdr *symhdr = elf_elfsections (abfd) [ghdr->sh_link];
--
-- if (symhdr->sh_type == SHT_SYMTAB
-- && ghdr->sh_info < symhdr->sh_size / bed->s->sizeof_sym)
-- return isympp[ghdr->sh_info - 1];
-- }
-- return NULL;
--}
--
- /* Return TRUE if the section is a DWO section. */
-
- static bfd_boolean
-@@ -1237,7 +1213,7 @@ is_strip_section (bfd *abfd ATTRIBUTE_UN
- /* PR binutils/3181
- If we are going to strip the group signature symbol, then
- strip the group section too. */
-- gsym = group_signature (sec);
-+ gsym = bfd_group_signature (sec, isympp);
- if (gsym != NULL)
- gname = gsym->name;
- else
-@@ -3091,7 +3067,7 @@ setup_section (bfd *ibfd, sec_ptr isecti
-
- if ((isection->flags & SEC_GROUP) != 0)
- {
-- asymbol *gsym = group_signature (isection);
-+ asymbol *gsym = bfd_group_signature (isection, isympp);
-
- if (gsym != NULL)
- {
diff -rup binutils-2.26.orig/binutils/readelf.c binutils-2.26/binutils/readelf.c
--- binutils-2.26.orig/binutils/readelf.c 2016-02-19 09:35:36.295000988 +0000
+++ binutils-2.26/binutils/readelf.c 2016-02-19 09:35:54.911106554 +0000
@@ -724,8 +672,9 @@ diff -rup binutils-2.26.orig/ld/emultempl/armelf.em binutils-2.26/ld/emultempl/a
if (thumb_entry_symbol)
{
-@@ -730,4 +730,4 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=
+@@ -730,5 +730,5 @@ LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=
LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse
+ LDEMUL_SET_SYMBOLS=gld"${EMULATION_NAME}"_set_symbols
# Call the extra arm-elf function
-LDEMUL_FINISH=gld${EMULATION_NAME}_finish
@@ -998,17 +947,7 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
#ifndef offsetof
#define offsetof(TYPE, MEMBER) ((size_t) & (((TYPE*) 0)->MEMBER))
#endif
-@@ -68,6 +72,9 @@ static lang_statement_list_type *stat_sa
- static lang_statement_list_type **stat_save_ptr = &stat_save[0];
- static struct unique_sections *unique_section_list;
- static struct asneeded_minfo *asneeded_list_head;
-+static cmdline_list_type cmdline_object_only_file_list;
-+static cmdline_list_type cmdline_object_only_archive_list;
-+static cmdline_list_type cmdline_temp_object_only_list;
-
- /* Forward declarations. */
- static void exp_init_os (etree_type *);
-@@ -86,6 +93,10 @@ static void lang_do_version_exports_sect
+@@ -86,6 +93,13 @@ static void lang_do_version_exports_sect
static void lang_finalize_version_expr_head
(struct bfd_elf_version_expr_head *);
static void lang_do_memory_regions (void);
@@ -1016,6 +955,9 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
+static void cmdline_get_object_only_input_files (void);
+static void print_cmdline_list (cmdline_union_type *);
+static bfd_boolean cmdline_on_object_only_archive_list_p (bfd *);
++static cmdline_list_type cmdline_object_only_file_list;
++static cmdline_list_type cmdline_object_only_archive_list;
++static cmdline_list_type cmdline_temp_object_only_list;
/* Exported variables. */
const char *output_target;
@@ -1052,7 +994,7 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
subsbfd = member;
if (!(*link_info.callbacks
->add_archive_element) (&link_info, member,
-@@ -6780,7 +6800,38 @@ lang_process (void)
+@@ -6780,10 +6800,41 @@ lang_process (void)
open_input_bfds (statement_list.head, OPEN_BFD_RESCAN);
}
}
@@ -1089,9 +1031,12 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
+ }
+ }
+ /* Make sure that nobody has tried to add a symbol to this list
+ before now. */
+ ASSERT (link_info.gc_sym_list == NULL);
+
link_info.gc_sym_list = &entry_symbol;
- if (entry_symbol.name == NULL)
-@@ -8275,3 +8326,965 @@ lang_print_memory_usage (void)
+@@ -8275,3 +8326,968 @@ lang_print_memory_usage (void)
printf (" %6.2f%%\n", percent);
}
}
@@ -1170,7 +1115,7 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
+ bfd *archive, *obfd, *oarchive;
+ ufile_ptr origin = abfd->origin;
+
-+ archive = bfd_my_archive (abfd);
++ archive = abfd->my_archive;
+ for (c = cmdline_object_only_archive_list.head; c != NULL; c = next)
+ {
+ if (c->header.type != cmdline_is_bfd_enum)
@@ -1178,7 +1123,7 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
+
+ next = c->header.next;
+ obfd = c->abfd.abfd;
-+ oarchive = bfd_my_archive (obfd);
++ oarchive = obfd->my_archive;
+
+ /* The list is grouped by archive file name and sorted by member
+ origin. */
@@ -1215,7 +1160,7 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
+ abort ();
+ case cmdline_is_bfd_enum:
+ abfd = (bfd *) data;
-+ archive = bfd_my_archive (abfd);
++ archive = abfd->my_archive;
+ if (archive)
+ break;
+ case cmdline_is_file_enum:
@@ -1248,7 +1193,7 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
+ next = c->header.next;
+
+ obfd = c->abfd.abfd;
-+ oarchive = bfd_my_archive (obfd);
++ oarchive = abfd->my_archive;
+
+ if (strcmp (archive->filename, oarchive->filename) == 0)
+ {
@@ -1281,7 +1226,7 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
+ break;
+ }
+
-+ narchive = bfd_my_archive (nbfd);
++ narchive = nbfd->my_archive;
+ if (strcmp (archive->filename, narchive->filename) != 0)
+ {
+ /* Insert it befor NEXT. */
@@ -1338,7 +1283,7 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
+ break;
+ case cmdline_is_bfd_enum:
+ abfd = c->abfd.abfd;
-+ if (bfd_my_archive (abfd))
++ if (abfd->my_archive)
+ abort ();
+ lang_add_input_file (abfd->filename,
+ lang_input_file_is_file_enum, NULL);
@@ -1354,7 +1299,7 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
+ next = c->header.next;
+
+ abfd = c->abfd.abfd;
-+ archive = bfd_my_archive (abfd);
++ archive = abfd->my_archive;
+
+ /* Add the first archive of the archive member group. */
+ lang_add_input_file (archive->filename,
@@ -1373,7 +1318,7 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
+ if (!next)
+ break;
+ nbfd = next->abfd.abfd;
-+ narchive = bfd_my_archive (nbfd);
++ narchive = nbfd->my_archive;
+ }
+ while (strcmp (archive->filename, narchive->filename) == 0);
+ }
@@ -1813,7 +1758,10 @@ diff -rup binutils-2.26.orig/ld/ldlang.c binutils-2.26/ld/ldlang.c
+ if (obfd)
+ bfd_close (obfd);
+ if (ofilename)
-+ unlink (ofilename);
++ {
++ unlink (ofilename);
++ free (ofilename);
++ }
+ einfo (_("%P%F: failed to add object-only section: %s\n"), err);
+}
+
@@ -2069,10 +2017,13 @@ diff -rup binutils-2.26.orig/ld/ldlang.h binutils-2.26/ld/ldlang.h
extern void lang_finish
(void);
extern lang_memory_region_type * lang_memory_region_lookup
-@@ -693,4 +693,45 @@ lang_ld_feature (char *);
+@@ -693,7 +693,48 @@ lang_ld_feature (char *);
extern void
lang_print_memory_usage (void);
+ extern void
+ lang_add_gc_name (const char *);
+
+typedef enum
+{
+ cmdline_is_file_enum,
@@ -2196,7 +2147,7 @@ diff -rup binutils-2.26.orig/ld/ldmain.c binutils-2.26/ld/ldmain.c
/* Even if we're producing relocatable output, some non-fatal errors should
@@ -465,6 +441,8 @@ main (int argc, char **argv)
- if (! bfd_close (link_info.output_bfd))
+ if (!bfd_close (link_info.output_bfd))
einfo (_("%F%B: final close failed: %E\n"), link_info.output_bfd);
+ link_info.output_bfd = NULL;
@@ -2318,7 +2269,7 @@ diff -rup binutils-2.26.orig/ld/plugin.c binutils-2.26/ld/plugin.c
+
/* Discard the real file's BFD and substitute the dummy one. */
- /* BFD archive handling caches elements so we can't call
+ /* We can't call bfd_close on archives. BFD archive handling
@@ -1227,14 +1233,17 @@ plugin_call_cleanup (void)
{
if (curplug->cleanup_handler && !curplug->cleanup_done)
@@ -2553,3 +2504,53 @@ diff -rup binutils-2.26.orig/ld/testsuite/ld-plugin/lto.exp binutils-2.26/ld/tes
run_cc_link_tests $lto_link_symbol_tests
+--- /dev/null 2016-08-19 08:03:37.292222041 +0100
++++ binutils-2.27/ld/testsuite/ld-plugin/lto-4a.c 2016-08-19 12:14:15.685818046 +0100
+@@ -0,0 +1,7 @@
++extern void foo(void);
++
++int main(void)
++{
++ foo();
++ return 0;
++}
+--- /dev/null 2016-08-19 08:03:37.292222041 +0100
++++ binutils-2.27/ld/testsuite/ld-plugin/lto-4b.c 2016-08-19 12:14:19.603842115 +0100
+@@ -0,0 +1,9 @@
++#include <stdio.h>
++
++extern void bar (void);
++
++void foo(void)
++{
++ bar ();
++ printf ("hello foo\n");
++}
+--- /dev/null 2016-08-19 08:03:37.292222041 +0100
++++ binutils-2.27/ld/testsuite/ld-plugin/lto-4c.c 2016-08-19 12:14:21.987856760 +0100
+@@ -0,0 +1,6 @@
++#include <stdio.h>
++
++void bar (void)
++{
++ printf ("hello bar\n");
++}
+--- /dev/null 2016-08-19 08:03:37.292222041 +0100
++++ binutils-2.27/ld/testsuite/ld-plugin/lto-10a.c 2016-08-19 12:14:27.670891671 +0100
+@@ -0,0 +1,6 @@
++extern int foo(void);
++
++int main(void)
++{
++ return foo();
++}
+--- /dev/null 2016-08-19 08:03:37.292222041 +0100
++++ binutils-2.27/ld/testsuite/ld-plugin/lto-10b.c 2016-08-19 12:14:33.380926748 +0100
+@@ -0,0 +1,7 @@
++#include <stdio.h>
++
++int foo(void)
++{
++ printf ("hello\n");
++ return 0;
++}
diff --git a/binutils/patches/binutils-2.26-x86-PIE-relocations.patch b/binutils/patches/binutils-2.26-x86-PIE-relocations.patch
deleted file mode 100644
index c39c3aa..0000000
--- a/binutils/patches/binutils-2.26-x86-PIE-relocations.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- binutils-2.26.orig/bfd/elf32-i386.c 2016-03-18 10:04:17.245507884 +0000
-+++ binutils-2.26/bfd/elf32-i386.c 2016-03-18 10:05:59.336070167 +0000
-@@ -1830,7 +1830,8 @@ do_size:
- && (sec->flags & SEC_ALLOC) != 0
- && (r_type != R_386_PC32
- || (h != NULL
-- && (! SYMBOLIC_BIND (info, h)
-+ && (! (bfd_link_pie (info)
-+ || SYMBOLIC_BIND (info, h))
- || h->root.type == bfd_link_hash_defweak
- || !h->def_regular))))
- || (ELIMINATE_COPY_RELOCS
-@@ -4287,8 +4288,8 @@ r_386_got32:
- else if (h != NULL
- && h->dynindx != -1
- && (r_type == R_386_PC32
-- || !bfd_link_pic (info)
-- || !SYMBOLIC_BIND (info, h)
-+ || !(bfd_link_executable (info)
-+ || SYMBOLIC_BIND (info, h))
- || !h->def_regular))
- outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
- else
---- binutils-2.26.orig/bfd/elf64-x86-64.c 2016-03-18 10:04:17.244507878 +0000
-+++ binutils-2.26/bfd/elf64-x86-64.c 2016-03-18 10:06:46.686331624 +0000
-@@ -2029,7 +2029,8 @@ do_size:
- && (sec->flags & SEC_ALLOC) != 0
- && (! IS_X86_64_PCREL_TYPE (r_type)
- || (h != NULL
-- && (! SYMBOLIC_BIND (info, h)
-+ && (! (bfd_link_pie (info)
-+ || SYMBOLIC_BIND (info, h))
- || h->root.type == bfd_link_hash_defweak
- || !h->def_regular))))
- || (ELIMINATE_COPY_RELOCS
-@@ -4631,8 +4632,8 @@ direct:
- else if (h != NULL
- && h->dynindx != -1
- && (IS_X86_64_PCREL_TYPE (r_type)
-- || ! bfd_link_pic (info)
-- || ! SYMBOLIC_BIND (info, h)
-+ || !(bfd_link_executable (info)
-+ || SYMBOLIC_BIND (info, h))
- || ! h->def_regular))
- {
- outrel.r_info = htab->r_info (h->dynindx, r_type);
diff --git a/binutils/patches/binutils-2.27-arm-aarch64-default-relro.patch b/binutils/patches/binutils-2.27-arm-aarch64-default-relro.patch
new file mode 100644
index 0000000..296800e
--- /dev/null
+++ b/binutils/patches/binutils-2.27-arm-aarch64-default-relro.patch
@@ -0,0 +1,20 @@
+--- binutils-2.27.orig/ld/emultempl/aarch64elf.em 2016-08-19 11:53:37.647284625 +0100
++++ binutils-2.27/ld/emultempl/aarch64elf.em 2016-08-19 11:54:41.916673347 +0100
+@@ -43,6 +43,7 @@ gld${EMULATION_NAME}_before_parse (void)
+ input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
+ config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
+ config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`;
++ link_info.relro = DEFAULT_LD_Z_RELRO;
+ }
+
+ static void
+--- binutils-2.27.orig/ld/emultempl/armelf.em 2016-08-19 11:53:37.647284625 +0100
++++ binutils-2.27/ld/emultempl/armelf.em 2016-08-19 11:54:51.035728502 +0100
+@@ -52,6 +52,7 @@ gld${EMULATION_NAME}_before_parse (void)
+ input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
+ config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
+ config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`;
++ link_info.relro = DEFAULT_LD_Z_RELRO;
+ }
+
+ static void
diff --git a/binutils/patches/binutils-2.27-relro-on-by-default.patch b/binutils/patches/binutils-2.27-relro-on-by-default.patch
new file mode 100644
index 0000000..8d9b6c1
--- /dev/null
+++ b/binutils/patches/binutils-2.27-relro-on-by-default.patch
@@ -0,0 +1,13 @@
+--- binutils-2.27.orig/ld/configure.tgt 2016-07-07 11:16:49.967963649 +0100
++++ binutils-2.27/ld/configure.tgt 2016-07-07 11:17:02.252045673 +0100
+@@ -901,8 +901,8 @@ frv-*-* | hppa*-*-* | ia64-*-* | mips*-*
+ # FAIL: objcopy -shared -z relro (tbss2)
+ # FAIL: objcopy -shared -z relro (tbss3)
+ ;;
+-*-*-linux*)
+- if test ${ac_default_ld_z_relro} = unset; then
++*)
++ if test x${ac_default_ld_z_relro} = xunset; then
+ ac_default_ld_z_relro=1
+ fi
+ ;;
diff --git a/binutils/patches/binutils-rh1312151.patch b/binutils/patches/binutils-rh1312151.patch
deleted file mode 100644
index e989b86..0000000
--- a/binutils/patches/binutils-rh1312151.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- binutils-2.26.orig/bfd/elflink.c 2016-02-26 13:21:54.134859610 +0000
-+++ binutils-2.26/bfd/elflink.c 2016-02-26 13:22:49.083168157 +0000
-@@ -555,6 +555,19 @@ bfd_elf_record_link_assignment (bfd *out
- if (h == NULL)
- return provide;
-
-+ if (h->versioned == unknown)
-+ {
-+ /* Set versioned if symbol version is unknown. */
-+ char *version = strrchr (name, ELF_VER_CHR);
-+ if (version)
-+ {
-+ if (version > name && version[-1] != ELF_VER_CHR)
-+ h->versioned = versioned_hidden;
-+ else
-+ h->versioned = versioned;
-+ }
-+ }
-+
- switch (h->root.type)
- {
- case bfd_link_hash_defined:
diff --git a/compat-readline/compat-readline.nm b/compat-readline/compat-readline.nm
new file mode 100644
index 0000000..5425043
--- /dev/null
+++ b/compat-readline/compat-readline.nm
@@ -0,0 +1,66 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = compat-readline
+version = 6.3
+release = 1
+
+thisapp = readline-%{version}
+
+groups = System/Libraries
+url = ftp://ftp.gnu.org/gnu/readline/
+license = GPLv3+
+summary = A library for editing typed command lines
+
+description
+ The Readline library provides a set of functions that allow users to
+ edit command lines. Both Emacs and vi editing modes are available.
+ The Readline library includes additional functions for maintaining a
+ list of previously-entered command lines for recalling or editing
+ those lines, and for performing csh-like history expansion on
+ previous commands.
+end
+
+source_dl = ftp://ftp.gnu.org/gnu/readline/
+
+build
+ requires
+ ncurses-devel
+ end
+
+ make_build_targets += \
+ SHLIB_LIBS=-lncurses
+
+ test
+ make check
+ end
+
+ install
+ # Only install libraries.
+ mkdir -pv %{BUILDROOT}%{libdir}
+
+ install -m 755 shlib/libhistory.so.6.3 %{BUILDROOT}%{libdir}
+ ln -svf libhistory.so.6.3 %{BUILDROOT}%{libdir}/libhistory.so.6
+
+ install -m 755 shlib/libreadline.so.6.3 %{BUILDROOT}%{libdir}
+ ln -svf libreadline.so.6.3 %{BUILDROOT}%{libdir}/libreadline.so.6
+ end
+end
+
+packages
+ package %{name}
+ provides
+ readline = %{thisver}
+ end
+
+ conflicts
+ readline <= %{thisver}
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/compat-readline/patches/readline-5.0-no_rpath.patch b/compat-readline/patches/readline-5.0-no_rpath.patch
new file mode 100644
index 0000000..befad63
--- /dev/null
+++ b/compat-readline/patches/readline-5.0-no_rpath.patch
@@ -0,0 +1,13 @@
+ripped from Fedora
+
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -102,7 +102,7 @@
+ SHOBJ_LD='${CC}'
+ SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+
+- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
++ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+ SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+ ;;
+
diff --git a/readline/patches/readline-5.0-no_rpath.patch b/readline/patches/readline-5.0-no_rpath.patch
new file mode 100644
index 0000000..befad63
--- /dev/null
+++ b/readline/patches/readline-5.0-no_rpath.patch
@@ -0,0 +1,13 @@
+ripped from Fedora
+
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -102,7 +102,7 @@
+ SHOBJ_LD='${CC}'
+ SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+
+- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
++ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+ SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+ ;;
+
diff --git a/readline/readline.nm b/readline/readline.nm
index 70f40cd..e45b366 100644
--- a/readline/readline.nm
+++ b/readline/readline.nm
@@ -4,7 +4,7 @@
###############################################################################
name = readline
-version = 6.3
+version = 7.0
release = 1
groups = System/Libraries
@@ -25,7 +25,6 @@ source_dl = ftp://ftp.gnu.org/gnu/readline/
build
requires
- audit-devel
ncurses-devel
end
hooks/post-receive
--
IPFire 3.x development tree
1
0