[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4616ecceced8208c695e697395f0b916d875fb91

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4616ecceced8208c695e697395f0b916d875fb91

[git]

[-- Attachment #1: Type: text/plain, Size: 3548 bytes --]

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  4616ecceced8208c695e697395f0b916d875fb91 (commit)
       via  2b23289ca2d15cc53cf8617ca8932d1ebb28b7ab (commit)
       via  4d3e174578dade4cb110ec7f370beb449fcaa48d (commit)
      from  935c2f233b730a010b241029f559e837d93a7ea7 (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 4616ecceced8208c695e697395f0b916d875fb91
Merge: 935c2f2 2b23289
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Aug 8 08:51:53 2014 +0200

    Merge branch 'master' into next

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/81/update.sh | 54 ++++----------------------------------
 1 file changed, 5 insertions(+), 49 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/81/update.sh b/config/rootfiles/core/81/update.sh
index 67244c6..16a559e 100644
--- a/config/rootfiles/core/81/update.sh
+++ b/config/rootfiles/core/81/update.sh
@@ -25,74 +25,30 @@
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
 # Remove old core updates from pakfire cache to save space...
-core=80
+core=81
 for (( i=1; i<=$core; i++ ))
 do
 	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
 # Stop services
-/etc/init.d/ipsec stop
 
 # Remove old strongswan files
-rm -f \
-	/etc/strongswan.d/charon/unity.conf \
-	/usr/lib/ipsec/plugins/libstrongswan-unity.so \
-	/usr/share/strongswan/templates/config/plugins/unity.conf
-
-rm -f /usr/local/bin/setddns.pl
 
 # Extract files
 extract_files
 
 # Start services
-/etc/init.d/dnsmasq restart
-if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
-	/etc/init.d/ipsec start
-fi
-
+/etc/init.d/apache restart
 
 # Update Language cache
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-# Uninstall the libgpg-error package.
-rm -f \
-	/opt/pakfire/db/installed/meta-libgpg-error \
-	/opt/pakfire/db/rootfiles/libgpg-error
-
-# Fix broken proxy configuration permissions
-chown -R nobody.nobody \
-	/var/ipfire/proxy/advanced \
-	/var/ipfire/proxy/acl-1.4 \
-	/var/ipfire/proxy/enable \
-	/var/ipfire/proxy/settings \
-	/var/ipfire/proxy/squid.conf \
-	/var/ipfire/proxy/transparent
-
-# Regenerate squid configuration file
-sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi
-
-# Generate ddns configuration file
-sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi
-
-# Update crontab
-sed -i /var/spool/cron/root.orig -e "/setddns.pl/d"
-
-grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
-
-# Update dynamic DNS records every five minutes.
-# Force an update once a month
-*/5 * * * *	[ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all
-3 2 1 * *	[ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force
-EOF
-
-fcrontab -z &>/dev/null
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
 sync
 
 # This update need a reboot...
-#touch /var/run/need_reboot
-
+touch /var/run/need_reboot
+^^
 # Finish
 /etc/init.d/fireinfo start
 sendprofile


hooks/post-receive
--
IPFire 2.x development tree