This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, fifteen has been updated via bb234c63ef0fd15a68044db3b172247884cbaa34 (commit) via dcbb8e4f41d6541663ae64f00a05b66e5e01f7cc (commit) via 30f68903d339fdb2e1a0b3ff62b6b770fee9ca36 (commit) via 5cd3a05bf0653726834489c87b80064584e6073b (commit) via 6c859e038223d4c6ec8535b7b7e635d9ef7fac1f (commit) via 325aa1e1f4b1948fe3dbd1bb6c65d056b1bebe29 (commit) via a1365ee37ccffa2be499d483ff1356d9f71013de (commit) via cfb00625b8224e929ecc4a2610bbe153f7ead475 (commit) via dfb1bfaf7b88a914ae2a384a0f30bdafaebc9125 (commit) from 0dc552342b48c1737f20e4a591b21b9812f0c624 (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 bb234c63ef0fd15a68044db3b172247884cbaa34 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Dec 23 22:28:27 2013 +0100
partresize: fix partresize for new arm image layout.
commit dcbb8e4f41d6541663ae64f00a05b66e5e01f7cc Merge: 30f6890 0dc5523 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Dec 23 22:27:58 2013 +0100
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
commit 30f68903d339fdb2e1a0b3ff62b6b770fee9ca36 Merge: 562e14b 5cd3a05 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Dec 21 10:05:39 2013 +0100
Merge remote-tracking branch 'origin/next' into fifteen
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/configroot | 1 + config/rootfiles/common/i586/strongswan-padlock | 1 - config/rootfiles/core/74/filelists/files | 1 + lfs/configroot | 2 +- lfs/strongswan | 6 ++---- make.sh | 2 +- src/initscripts/init.d/partresize | 4 ++-- src/scripts/httpscert | 9 +-------- 8 files changed, 9 insertions(+), 17 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 087443a..b1097cd 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -155,6 +155,7 @@ var/ipfire/proxy #var/ipfire/proxy/calamaris #var/ipfire/proxy/calamaris/bin #var/ipfire/proxy/settings +#var/ipfire/proxy/squid.conf var/ipfire/qos #var/ipfire/qos/bin #var/ipfire/qos/bin/RRD-func.pl diff --git a/config/rootfiles/common/i586/strongswan-padlock b/config/rootfiles/common/i586/strongswan-padlock index 4ebfc75..02aa457 100644 --- a/config/rootfiles/common/i586/strongswan-padlock +++ b/config/rootfiles/common/i586/strongswan-padlock @@ -1,2 +1 @@ usr/lib/ipsec/plugins/libstrongswan-padlock.so -usr/lib/ipsec/plugins/libstrongswan-rdrand.so diff --git a/config/rootfiles/core/74/filelists/files b/config/rootfiles/core/74/filelists/files index 5a874e7..52d0178 100644 --- a/config/rootfiles/core/74/filelists/files +++ b/config/rootfiles/core/74/filelists/files @@ -2,5 +2,6 @@ etc/system-release etc/issue srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/proxy.cgi +usr/local/bin/httpscert var/ipfire/header.pl var/ipfire/langs diff --git a/lfs/configroot b/lfs/configroot index f73453d..98e7af3 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -68,7 +68,7 @@ $(TARGET) : fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwlogs/ipsettings fwlogs/portsettings \ isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ - ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ + ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \ vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \ touch $(CONFIG_ROOT)/$$i; \ diff --git a/lfs/strongswan b/lfs/strongswan index 948db5b..5c411a3 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -34,12 +34,10 @@ TARGET = $(DIR_INFO)/$(THISAPP)
ifeq "$(MACHINE)" "i586" CONFIGURE_OPTIONS = \ - --enable-padlock \ - --enable-rdrand + --enable-padlock else CONFIGURE_OPTIONS = \ - --disable-padlock \ - --disable-rdrand + --disable-padlock endif
############################################################################### diff --git a/make.sh b/make.sh index 8de5097..8e7252f 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number CORE="74" # Core Level (Filename) -PAKFIRE_CORE="73" # Core Level (PAKFIRE) +PAKFIRE_CORE="74" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/initscripts/init.d/partresize b/src/initscripts/init.d/partresize index d4e4db2..909d63f 100644 --- a/src/initscripts/init.d/partresize +++ b/src/initscripts/init.d/partresize @@ -6,7 +6,7 @@ # # Authors : Arne Fitzenreiter - arne_f@ipfire.org # -# Version : 1.02 +# Version : 1.03 # # Notes : # @@ -37,7 +37,7 @@ case "${1}" in fi
boot_mesg "Change Partition ${DRV}3 to all free space ..." - echo -e 'd\n3\nn\np\n3\n\n\nw\nq\n' | fdisk ${DRV} + echo -e ',+' | sfdisk --no-reread -N3 ${DRV} 2>/dev/null
# Erase symlink, it should run only once rm -f /etc/rc.d/rcsysinit.d/S25partresize diff --git a/src/scripts/httpscert b/src/scripts/httpscert index fb2d64b..d0e23fa 100644 --- a/src/scripts/httpscert +++ b/src/scripts/httpscert @@ -6,13 +6,9 @@ # See how we were called. case "$1" in new) - # set temporary random file - export RANDFILE=/root/.rnd if [ ! -f /etc/httpd/server.key ]; then echo "Generating https server key." - /usr/bin/openssl genrsa -rand \ - /boot/vmlinuz:CONFIG_ROOT/ethernet/settings -out \ - /etc/httpd/server.key 1024 + /usr/bin/openssl genrsa -out /etc/httpd/server.key 4096 fi echo "Generating CSR" /bin/cat /etc/certparams | sed "s/HOSTNAME/`hostname -f`/" | /usr/bin/openssl \ @@ -21,9 +17,6 @@ case "$1" in /usr/bin/openssl x509 -req -days 999999 -in \ /etc/httpd/server.csr -signkey /etc/httpd/server.key -out \ /etc/httpd/server.crt - # unset and remove random file - export -n RANDFILE - rm -f /root/.rnd ;; read) if [ -f /etc/httpd/server.key -a -f /etc/httpd/server.crt -a -f /etc/httpd/server.csr ]; then
hooks/post-receive -- IPFire 2.x development tree