[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c1250cd8f43a42b54360c3a6118396d67569fe83 - IPFire-SCM

13 Nov 2011

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  c1250cd8f43a42b54360c3a6118396d67569fe83 (commit)
       via  528cb9a7012c6f5ff1de74acb2150f96169c6bf7 (commit)
       via  44b2f168bb7cae6078f2b1c5d2fd31e07652a246 (commit)
       via  a6cbada13ea41e0891d0ab089167ecc40385661b (commit)
       via  adc9102075571aa319b79308a77f13a2dba28c09 (commit)
      from  b514fe3fba3fa2e631128a526a63cd1ad6a499cf (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 c1250cd8f43a42b54360c3a6118396d67569fe83
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Nov 13 14:30:18 2011 +0100
lcd4linux: update to svn1158 and add hacked digital-photo-frame driver.
thx to gerdh for his work and inspiration.
commit 528cb9a7012c6f5ff1de74acb2150f96169c6bf7
Author: Stefan Schantl stefan.schantl@ipfire.org
Date:   Wed Nov 9 21:09:09 2011 +0100
vpnmain.cgi: Allow %any as remote host/IP.
http://forum.ipfire.org/index.php?topic=5458.0
commit 44b2f168bb7cae6078f2b1c5d2fd31e07652a246
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Nov 4 15:07:34 2011 +0100
dhcp: Fix syntax error in dhcpcd.exe.
http://forum.ipfire.org/index.php?topic=5418.msg38636#msg38636
commit a6cbada13ea41e0891d0ab089167ecc40385661b
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Nov 4 14:51:10 2011 +0100
fcron: Fix permissions of configuration files.
Some people had trouble with building the package on
    Ubuntu 10.10.
http://forum.ipfire.org/index.php?topic=5107.msg38692#msg38692
commit adc9102075571aa319b79308a77f13a2dba28c09
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Nov 4 14:46:30 2011 +0100
Don't load H323 conntrack modules by default.
This happens to cause trouble with transmitting the audio through
    an IPsec tunnel.
http://forum.ipfire.org/index.php?topic=5459.0
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/packages/dpfhack            |    3 +++
 html/cgi-bin/vpnmain.cgi                     |    2 +-
 lfs/{parted => dpfhack}                      |   23 +++++++++++------------
 lfs/fcron                                    |    1 +
 lfs/lcd4linux                                |   16 ++++++++--------
 make.sh                                      |    3 ++-
 src/initscripts/init.d/network               |    2 ++
 src/initscripts/init.d/networking/dhcpcd.exe |    2 +-
 src/patches/dpfhack.patch                    |   12 ++++++++++++
 9 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 config/rootfiles/packages/dpfhack
 copy lfs/{parted => dpfhack} (88%)
 create mode 100644 src/patches/dpfhack.patch
Difference in files:

diff --git a/config/rootfiles/packages/dpfhack b/config/rootfiles/packages/dpfhack
new file mode 100644
index 0000000..27319b4
--- /dev/null
+++ b/config/rootfiles/packages/dpfhack
@@ -0,0 +1,3 @@
+#usr/include/dpf.h
+#usr/include/usbuser.h
+usr/lib/libdpf.so
\ No newline at end of file
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index e1a8200..eea2c01 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1351,7 +1351,7 @@ END
    }
if ($cgiparams{'REMOTE'}) {
-	    if (! &General::validip($cgiparams{'REMOTE'})) {
+	    if (($cgiparams{'REMOTE'} ne '%any') && (! &General::validip($cgiparams{'REMOTE'}))) {
    	if (! &General::validfqdn ($cgiparams{'REMOTE'}))  {
    	    $errormessage = $Lang::tr{'invalid input for remote host/ip'};
    	    goto VPNCONF_ERROR;
diff --git a/lfs/dpfhack b/lfs/dpfhack
new file mode 100644
index 0000000..00d6545
--- /dev/null
+++ b/lfs/dpfhack
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  IPFire Team  info@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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.12devel
+APP        = dpf
+THISAPP    = dpfhack-$(VER)
+DL_FILE    = $(THISAPP).tgz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(APP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = dpfhack
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 00473bb01d8da7c5967ecb19ca251ac2
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(PROG).patch
+	cd $(DIR_APP) && make 
+	cd $(DIR_APP) && cp Debug/libdpf.so /usr/lib && cp dpflib/dpf.h include/usbuser.h /usr/include
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/fcron b/lfs/fcron
index 38343d4..d8fe8fb 100644
--- a/lfs/fcron
+++ b/lfs/fcron
@@ -102,6 +102,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    echo "Place scripts run weekly here ..." > /etc/fcron.weekly/info.txt
    echo "Place scripts run monthly here ..." > /etc/fcron.monthly/info.txt
+	chmod 640 /etc/fcron.{conf,allow,deny}
    /usr/bin/fcrontab $(DIR_SRC)/config/cron/crontab
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/lcd4linux b/lfs/lcd4linux
index a0ae138..446a131 100644
--- a/lfs/lcd4linux
+++ b/lfs/lcd4linux
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team  info@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,17 +24,17 @@
include Config
-VER        = 0.10.1-RC2
+VER        = 0.11.0-svn1158-dpf
THISAPP    = lcd4linux-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lcd4linux
 PAK_VER    = 2
-DEPS       = ""
+DEPS       = "dpfhack libmpdclient"
###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a64c40feb74862cb4a91281bc7737f72
+$(DL_FILE)_MD5 = 0b7eba14a92ae5d51a3ab99948192b8d
install : $(TARGET)
@@ -76,9 +76,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/lcd4linux
-	cd $(DIR_APP) && make $(MAKETUNING)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure  --with-plugins=all,!qnaplog,!dbus --prefix=/usr
+	cd $(DIR_APP) && make
    cd $(DIR_APP) && make install
    install -v -m 644 $(DIR_SRC)/config/backup/includes/lcd4linux /var/ipfire/backup/addons/includes/lcd4linux
    @rm -rf $(DIR_APP)
diff --git a/make.sh b/make.sh
index b1e9b68..9f8678f 100755
--- a/make.sh
+++ b/make.sh
@@ -603,7 +603,6 @@ buildipfire() {
   ipfiremake lm_sensors
   ipfiremake liboping
   ipfiremake collectd
-  ipfiremake lcd4linux
   ipfiremake teamspeak
   ipfiremake elinks
   ipfiremake igmpproxy
@@ -702,6 +701,8 @@ buildipfire() {
   ipfiremake intltool
   ipfiremake pakfire3-deps
   ipfiremake transmission
+  ipfiremake dpfhack
+  ipfiremake lcd4linux
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 5542214..9de3994 100644
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -31,6 +31,8 @@ init_networking() {
    if [ -e /var/ipfire/main/disable_nf_sip ]; then
    	rmmod nf_nat_sip
    	rmmod nf_conntrack_sip
+		rmmod nf_nat_h323
+		rmmod nf_conntrack_h323
    fi
boot_mesg "Setting up firewall"
diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe
index ac835c5..d61c3d5 100644
--- a/src/initscripts/init.d/networking/dhcpcd.exe
+++ b/src/initscripts/init.d/networking/dhcpcd.exe
@@ -39,7 +39,7 @@ dhcpcd_up()
    	fi
#Check if we have to restart the services at update
-		[ ! -e "/var/ipfire/red/active" ] update=1;
+		[ ! -e "/var/ipfire/red/active" ] && update=1;
    	if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then
    		update=1;
    	fi
diff --git a/src/patches/dpfhack.patch b/src/patches/dpfhack.patch
new file mode 100644
index 0000000..2a47317
--- /dev/null
+++ b/src/patches/dpfhack.patch
@@ -0,0 +1,12 @@
+diff -Naur dpf_alt/python/Makefile dpf/python/Makefile
+--- dpf_alt/python/Makefile	2011-04-18 17:14:12.000000000 +0200
++++ dpf/python/Makefile	2011-08-14 13:22:46.129748815 +0200
+@@ -32,7 +32,7 @@
+ endif
+ 
+ ifeq (Linux, $(PLATFORM))
+-	PYTHON=$(shell pyversions -d)
++	PYTHON=python2.7
+ 	include $(DEVLIB)/unixdll.mk
+ 	DLLDEPS = $(CLIENTLIB) -l$(PYTHON)
+ 	PYTHONINCLUDES = -I/usr/include/$(PYTHON)
hooks/post-receive
--
IPFire 2.x development tree

    