Fix permissions of images/updbooster

some ipp2p fixes. still not working ...
New kernel at updater

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 3e719354713541ba5018af52685f488c14a53d73..32efa811f150fa3b1800cdaa64025e7e5af768bc 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -26,7 +26,7 @@
 #
 OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
 NEWVERSION="2.3"
-KVER="2.6.23.17"
+KVER="2.6.25.17"
 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
 MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
@@ -53,6 +53,7 @@ echo etc/udev/rules.d/30-persistent-network.rules >> /opt/pakfire/tmp/ROOTFILES
 echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
 echo var/log/rrd >> /opt/pakfire/tmp/ROOTFILES
 echo var/updatexlerator >> /opt/pakfire/tmp/ROOTFILES
+echo lib/iptables >> /opt/pakfire/tmp/ROOTFILES
 #
 tar cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
    -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 
@@ -67,6 +68,10 @@ rm -rf /etc/rc.d/rc3.d/S20collectd
 #
 rm -rf /etc/sysconfig/lm_sensors
 #
+# Delete old iptables libs...
+#
+rm -rf /lib/iptables
+#
 # Remove old kernel, configs, initrd, modules ...
 #
 rm -rf /boot/System.map-*

diff --git a/lfs/ipp2p b/lfs/ipp2p
index ddd798c5a67e5907e3417ead25d87252cd370cc5..bfd97bb40265e5d567cce303dbff2d6cbd96ef74 100644 (file)
--- a/lfs/ipp2p
+++ b/lfs/ipp2p
@@ -68,7 +68,7 @@ ifeq "$(SMP)" "1"
 else
 ifeq "$(IPT)" "1"
        cd $(DIR_APP) && make libipt_ipp2p.so
-       cp -f $(DIR_APP)/libipt_ipp2p.so /lib/iptables
+       cp -f $(DIR_APP)/libipt_ipp2p.so /lib/xtables
 else
        cd $(DIR_APP) && make ipt_ipp2p.ko
        cp -f $(DIR_APP)/ipt_ipp2p.ko /lib/modules/$(KVER)-ipfire/kernel/net/ipv4/netfilter

diff --git a/lfs/openswan b/lfs/openswan
index ddcd0ae43102be67f72fdf647602aec2d8b749ab..3420840c55ae084e1ec884414a7e8a16acf291ec 100644 (file)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -78,7 +78,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/openswan-2.6.16-sa_fam_unspec.patch
 ifeq "$(KMOD)" "1"
        cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module
        cd $(DIR_APP) && make minstall

diff --git a/lfs/squid b/lfs/squid
index c36170a8be82fe1ed707ff7ae85253629f66c064..6b689a8a94864983ec970738ddfb100c2ac36a97 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -128,6 +128,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chmod 775 /var/updatecache/download
        chmod 775 /var/updatecache/metadata
        chmod 755 /var/log/updatexlrator
+       chmod 755 /srv/web/ipfire/html/images/updbooster
        
        chown squid:squid /var/log/squid
        ln -sf /usr/lib/squid /usr/lib/squid/auth

diff --git a/make.sh b/make.sh
index c681d3e1a974364919a49bad17e692968e9405a8..721bc6c00b0a5f5404e7c86b2de49c07dc218099 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -416,7 +416,7 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-  ipfiremake ipp2p                     IPT=1
+#  ipfiremake ipp2p                    IPT=1
   ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate