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

30 Nov 2010

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  f9c750efad9e9c23f43c84e42c83a488b954667d (commit)
       via  0c719f9351543073b0d77e3f27b6e32873fa8eca (commit)
       via  989a31e20cbc97b37227b513b5b584e0ec94f38c (commit)
      from  df7212afb305098e431b1bc9a862802e4e7fffd7 (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 f9c750efad9e9c23f43c84e42c83a488b954667d
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Tue Nov 30 21:58:20 2010 +0100
Add force dhcp mtu option to setup.
commit 0c719f9351543073b0d77e3f27b6e32873fa8eca
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Tue Nov 30 20:49:04 2010 +0100
Add force mtu option to dhcp-client.
commit 989a31e20cbc97b37227b513b5b584e0ec94f38c
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Tue Nov 30 15:38:32 2010 +0100
Add acl support for samba and rsync.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/acl                  |   67 ++++++++++++++++++++++++++
 config/rootfiles/common/attr                 |   33 +++++++++++++
 config/rootfiles/core/43/filelists/acl       |    1 +
 config/rootfiles/core/43/filelists/files     |    2 +
 langs/de/install/lang_de.c                   |    2 +
 langs/en/install/lang_en.c                   |    2 +
 langs/es/install/lang_es.c                   |    2 +
 langs/fr/install/lang_fr.c                   |    2 +
 lfs/{usb_modeswitch_data => acl}             |   12 +++--
 lfs/attr                                     |   10 +---
 lfs/rsync                                    |    4 +-
 lfs/samba                                    |    2 +-
 make.sh                                      |    1 +
 src/initscripts/init.d/networking/dhcpcd.exe |   12 +++++
 src/install+setup/libsmooth/netstuff.c       |   33 ++++++++++--
 15 files changed, 164 insertions(+), 21 deletions(-)
 create mode 100644 config/rootfiles/common/acl
 create mode 120000 config/rootfiles/core/43/filelists/acl
 copy lfs/{usb_modeswitch_data => acl} (93%)
Difference in files:

diff --git a/config/rootfiles/common/acl b/config/rootfiles/common/acl
new file mode 100644
index 0000000..630e4c7
--- /dev/null
+++ b/config/rootfiles/common/acl
@@ -0,0 +1,67 @@
+usr/bin/chacl
+usr/bin/getfacl
+usr/bin/setfacl
+#usr/include/acl
+#usr/include/acl/libacl.h
+#usr/include/sys/acl.h
+#usr/lib/libacl.a
+#usr/lib/libacl.la
+usr/lib/libacl.so
+usr/lib/libacl.so.1
+usr/lib/libacl.so.1.1.0
+#usr/libexec/libacl.a
+#usr/libexec/libacl.la
+usr/libexec/libacl.so
+#usr/man/man1/chacl.1
+#usr/man/man1/getfacl.1
+#usr/man/man1/setfacl.1
+#usr/man/man3/acl_add_perm.3
+#usr/man/man3/acl_calc_mask.3
+#usr/man/man3/acl_check.3
+#usr/man/man3/acl_clear_perms.3
+#usr/man/man3/acl_cmp.3
+#usr/man/man3/acl_copy_entry.3
+#usr/man/man3/acl_copy_ext.3
+#usr/man/man3/acl_copy_int.3
+#usr/man/man3/acl_create_entry.3
+#usr/man/man3/acl_delete_def_file.3
+#usr/man/man3/acl_delete_entry.3
+#usr/man/man3/acl_delete_perm.3
+#usr/man/man3/acl_dup.3
+#usr/man/man3/acl_entries.3
+#usr/man/man3/acl_equiv_mode.3
+#usr/man/man3/acl_error.3
+#usr/man/man3/acl_extended_fd.3
+#usr/man/man3/acl_extended_file.3
+#usr/man/man3/acl_free.3
+#usr/man/man3/acl_from_mode.3
+#usr/man/man3/acl_from_text.3
+#usr/man/man3/acl_get_entry.3
+#usr/man/man3/acl_get_fd.3
+#usr/man/man3/acl_get_file.3
+#usr/man/man3/acl_get_perm.3
+#usr/man/man3/acl_get_permset.3
+#usr/man/man3/acl_get_qualifier.3
+#usr/man/man3/acl_get_tag_type.3
+#usr/man/man3/acl_init.3
+#usr/man/man3/acl_set_fd.3
+#usr/man/man3/acl_set_file.3
+#usr/man/man3/acl_set_permset.3
+#usr/man/man3/acl_set_qualifier.3
+#usr/man/man3/acl_set_tag_type.3
+#usr/man/man3/acl_size.3
+#usr/man/man3/acl_to_any_text.3
+#usr/man/man3/acl_to_text.3
+#usr/man/man3/acl_valid.3
+#usr/man/man5/acl.5
+#usr/share/doc/acl
+#usr/share/doc/acl/CHANGES.gz
+#usr/share/doc/acl/COPYING
+#usr/share/doc/acl/PORTING
+#usr/share/doc/acl/README
+#usr/share/locale/de/LC_MESSAGES/acl.mo
+#usr/share/locale/es/LC_MESSAGES/acl.mo
+#usr/share/locale/fr/LC_MESSAGES/acl.mo
+#usr/share/locale/gl/LC_MESSAGES/acl.mo
+#usr/share/locale/pl/LC_MESSAGES/acl.mo
+#usr/share/locale/sv/LC_MESSAGES/acl.mo
diff --git a/config/rootfiles/common/attr b/config/rootfiles/common/attr
index 60da05e..1d9cfc0 100644
--- a/config/rootfiles/common/attr
+++ b/config/rootfiles/common/attr
@@ -1,13 +1,46 @@
 usr/bin/attr
 usr/bin/getfattr
 usr/bin/setfattr
+#usr/include/attr
+#usr/include/attr/attributes.h
+#usr/include/attr/error_context.h
+#usr/include/attr/libattr.h
+#usr/include/attr/xattr.h
+#usr/lib/libattr.a
 #usr/lib/libattr.la
 usr/lib/libattr.so
 usr/lib/libattr.so.1
 usr/lib/libattr.so.1.1.0
+#usr/libexec
+#usr/libexec/libattr.a
+#usr/libexec/libattr.la
+usr/libexec/libattr.so
 #usr/man/man1/attr.1
 #usr/man/man1/getfattr.1
 #usr/man/man1/setfattr.1
+#usr/man/man2
+#usr/man/man2/fgetxattr.2
+#usr/man/man2/flistxattr.2
+#usr/man/man2/fremovexattr.2
+#usr/man/man2/fsetxattr.2
+#usr/man/man2/getxattr.2
+#usr/man/man2/lgetxattr.2
+#usr/man/man2/listxattr.2
+#usr/man/man2/llistxattr.2
+#usr/man/man2/lremovexattr.2
+#usr/man/man2/lsetxattr.2
+#usr/man/man2/removexattr.2
+#usr/man/man2/setxattr.2
+#usr/man/man3/attr_get.3
+#usr/man/man3/attr_getf.3
+#usr/man/man3/attr_list.3
+#usr/man/man3/attr_listf.3
+#usr/man/man3/attr_multi.3
+#usr/man/man3/attr_multif.3
+#usr/man/man3/attr_remove.3
+#usr/man/man3/attr_removef.3
+#usr/man/man3/attr_set.3
+#usr/man/man3/attr_setf.3
 #usr/man/man5/attr.5
 #usr/share/doc/attr
 #usr/share/doc/attr/CHANGES.gz
diff --git a/config/rootfiles/core/43/filelists/acl b/config/rootfiles/core/43/filelists/acl
new file mode 120000
index 0000000..d819f9c
--- /dev/null
+++ b/config/rootfiles/core/43/filelists/acl
@@ -0,0 +1 @@
+../../../common/acl
\ No newline at end of file
diff --git a/config/rootfiles/core/43/filelists/files b/config/rootfiles/core/43/filelists/files
index ec74a1d..5bc2127 100644
--- a/config/rootfiles/core/43/filelists/files
+++ b/config/rootfiles/core/43/filelists/files
@@ -3,6 +3,7 @@ etc/rc.d/init.d/checkfs
 etc/rc.d/init.d/checkfstab
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/squid
+etc/rc.d/init.d/networking/dhcpcd.exe
 srv/web/ipfire/cgi-bin/extrahd.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/speed.cgi
@@ -12,4 +13,5 @@ var/ipfire/general-functions.pl
 var/ipfire/extrahd/bin/extrahd.pl
 usr/local/bin/rebuild-initrd
 usr/local/bin/scanhd
+usr/local/sbin/setup
 usr/bin/ldd
diff --git a/langs/de/install/lang_de.c b/langs/de/install/lang_de.c
index a1df97c..6c8c7e5 100644
--- a/langs/de/install/lang_de.c
+++ b/langs/de/install/lang_de.c
@@ -589,4 +589,6 @@ char *de_tr[] = {
 "Lade Installations-Abbild ...",
 /* TR_DOWNLOAD_ERROR */
 "Beim Herunterladen ist ein Fehler aufgetreten!",
+/* TR_DHCP_FORCE_MTU */
+"DHCP MTU setzen:",
 };
diff --git a/langs/en/install/lang_en.c b/langs/en/install/lang_en.c
index b8edeac..10c35b4 100644
--- a/langs/en/install/lang_en.c
+++ b/langs/en/install/lang_en.c
@@ -585,4 +585,6 @@ char *en_tr[] = {
 "Downloading Installation-Image ...",
 /* TR_DOWNLOAD_ERROR */
 "Error while downloading!",
+/* TR_DHCP_FORCE_MTU */
+"Force DHCP mtu:",
 };
diff --git a/langs/es/install/lang_es.c b/langs/es/install/lang_es.c
index 63e2eab..a6ad3e9 100644
--- a/langs/es/install/lang_es.c
+++ b/langs/es/install/lang_es.c
@@ -581,4 +581,6 @@ char *es_tr[] = {
 "Downloading Installation-Image ...",
 /* TR_DOWNLOAD_ERROR */
 "Error while downloading!",
+/* TR_DHCP_FORCE_MTU */
+"Force DHCP mtu:",
 };
diff --git a/langs/fr/install/lang_fr.c b/langs/fr/install/lang_fr.c
index d2abdba..6fbcc41 100644
--- a/langs/fr/install/lang_fr.c
+++ b/langs/fr/install/lang_fr.c
@@ -581,4 +581,6 @@ char *fr_tr[] = {
 "Downloading Installation-Image ...",
 /* TR_DOWNLOAD_ERROR */
 "Error while downloading!",
+/* TR_DHCP_FORCE_MTU */
+"Force DHCP mtu:",
 };
diff --git a/lfs/acl b/lfs/acl
new file mode 100644
index 0000000..047ff5e
--- /dev/null
+++ b/lfs/acl
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2010  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        = 2.2.47
+
+THISAPP    = acl-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 09c8b9684695527e8f237364afb7811f
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# 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 jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && make install-lib
+	cd $(DIR_APP) && make install-dev
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/attr b/lfs/attr
index a7c0ab8..2794ad6 100644
--- a/lfs/attr
+++ b/lfs/attr
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  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        #
@@ -73,11 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    cd $(DIR_APP) && ./configure
    cd $(DIR_APP) && make
    cd $(DIR_APP) && make install
-	# Install libattr
-	cp $(DIR_APP)/libattr/.libs/libattr.so* /usr/lib
-	cp $(DIR_APP)/libattr/libattr.la /usr/lib
-	# Install includes
-#	-mkdir /usr/include/attr
-#	cp -f $(DIR_APP)/include/*.h /usr/include/attr
+	cd $(DIR_APP) && make install-lib
+	cd $(DIR_APP) && make install-dev
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/rsync b/lfs/rsync
index 38a2a9f..a68e191 100644
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  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        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
-PAK_VER    = 4
+PAK_VER    = 5
DEPS       = ""
diff --git a/lfs/samba b/lfs/samba
index 8a354d8..2740ac5 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 31
+PAK_VER    = 32
DEPS       = "cups"
diff --git a/make.sh b/make.sh
index a519f40..4d49eaa 100755
--- a/make.sh
+++ b/make.sh
@@ -432,6 +432,7 @@ buildipfire() {
   ipfiremake slang
   ipfiremake newt
   ipfiremake attr
+  ipfiremake acl
   ipfiremake libcap
   ipfiremake pciutils
   ipfiremake usbutils
diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe
index 0d06bcb..ac835c5 100644
--- a/src/initscripts/init.d/networking/dhcpcd.exe
+++ b/src/initscripts/init.d/networking/dhcpcd.exe
@@ -23,9 +23,21 @@ dhcpcd_up()
    set | grep "^new_" | sed "s|^new_||g" | \
    sort > /var/ipfire/dhcpc/dhcpcd-$interface.info
+	#Check if this was the Red device...
+	if [ ! "$interface" == "$RED_DEV" ]; then
+		exit 0;
+	fi
+
    # Only if RED_TYPE=DHCP update /var/ipfire/red
    if [ "$RED_TYPE" == "DHCP" ]; then
+		#Force MTU option for KabelDeutschland because this ISP
+		#set the MTU to 576 instead of the supportet 1500
+		if [ $RED_DHCP_FORCE_MTU -ge 576 ]; then
+			logger -p local0.info -t dhcpcd.exe[$$] "Force mtu to $RED_DHCP_FORCE_MTU"
+			ip link set $interface mtu $RED_DHCP_FORCE_MTU
+		fi
+
    	#Check if we have to restart the services at update
    	[ ! -e "/var/ipfire/red/active" ] update=1;
    	if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then
diff --git a/src/install+setup/libsmooth/netstuff.c b/src/install+setup/libsmooth/netstuff.c
index eb0c4e7..46e49c0 100644
--- a/src/install+setup/libsmooth/netstuff.c
+++ b/src/install+setup/libsmooth/netstuff.c
@@ -31,6 +31,7 @@ newtComponent statictyperadio;
 newtComponent dhcptyperadio;
 newtComponent pppoetyperadio;
 newtComponent dhcphostnameentry;
+newtComponent dhcpforcemtuentry;
/* acceptable character filter for IP and netmaks entry boxes */
 static int ip_input_filter(newtComponent entry, void * data, int ch, int cursor)
@@ -49,11 +50,13 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
    char *addressresult;
    char *netmaskresult;
    char *dhcphostnameresult;
+	char *dhcpforcemturesult;
    struct newtExitStruct es;
    newtComponent header;
    newtComponent addresslabel;
    newtComponent netmasklabel;
    newtComponent dhcphostnamelabel;
+	newtComponent dhcpforcemtulabel;
    newtComponent ok, cancel;	
    char message[1000];
    char temp[STRING_SIZE];
@@ -61,6 +64,7 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
    char netmaskfield[STRING_SIZE];
    char typefield[STRING_SIZE];
    char dhcphostnamefield[STRING_SIZE];
+	char dhcpforcemtufield[STRING_SIZE];
    int error;
    int result = 0;
    char type[STRING_SIZE];
@@ -73,6 +77,7 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
    sprintf(netmaskfield, "%s_NETMASK", colour);
    sprintf(typefield, "%s_TYPE", colour);
    sprintf(dhcphostnamefield, "%s_DHCP_HOSTNAME", colour);
+	sprintf(dhcpforcemtufield, "%s_DHCP_FORCE_MTU", colour);
    	
    sprintf(message, ctr[TR_INTERFACE], colour);
    newtCenteredWindow(44, (typeflag ? 18 : 12), message);
@@ -99,15 +104,25 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
    	newtComponentAddCallback(statictyperadio, networkdialogcallbacktype, NULL);
    	newtComponentAddCallback(dhcptyperadio, networkdialogcallbacktype, NULL);
    	newtComponentAddCallback(pppoetyperadio, networkdialogcallbacktype, NULL);
-		dhcphostnamelabel = newtTextbox(2, 9, 18, 1, 0);
+		dhcphostnamelabel = newtTextbox(2, 8, 18, 1, 0);
    	newtTextboxSetText(dhcphostnamelabel, ctr[TR_DHCP_HOSTNAME]);
+		dhcpforcemtulabel = newtTextbox(2, 9, 18, 1, 0);
+		newtTextboxSetText(dhcpforcemtulabel, ctr[TR_DHCP_FORCE_MTU]);
    	strcpy(temp, defaultdhcphostname);
    	findkey(kv, dhcphostnamefield, temp);
-		dhcphostnameentry = newtEntry(20, 9, temp, 20, &dhcphostnameresult, 0);
-		newtFormAddComponent(networkform, dhcphostnamelabel);		
-		newtFormAddComponent(networkform, dhcphostnameentry);	
+		dhcphostnameentry = newtEntry(20, 8, temp, 20, &dhcphostnameresult, 0);
+		strcpy(temp, "");
+		findkey(kv, dhcpforcemtufield, temp);
+		dhcpforcemtuentry = newtEntry(20, 9, temp, 20, &dhcpforcemturesult, 0);
+		newtFormAddComponent(networkform, dhcphostnamelabel);
+		newtFormAddComponent(networkform, dhcphostnameentry);
+		newtFormAddComponent(networkform, dhcpforcemtulabel);
+		newtFormAddComponent(networkform, dhcpforcemtuentry);
    	if (startdhcptype == 0)
-			newtEntrySetFlags(dhcphostnameentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET);
+			{
+				newtEntrySetFlags(dhcphostnameentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET);
+				newtEntrySetFlags(dhcpforcemtuentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET);
+			}
    }
    /* Address */
    addresslabel = newtTextbox(2, (typeflag ? 11 : 4) + 0, 18, 1, 0);
@@ -184,6 +199,7 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
    			if (typeflag)
    			{
    				replacekeyvalue(kv, dhcphostnamefield, dhcphostnameresult);
+					replacekeyvalue(kv, dhcpforcemtufield, dhcpforcemturesult);
    				if (strcmp(type, "STATIC") != 0)
    				{
    					replacekeyvalue(kv, addressfield, "0.0.0.0");
@@ -296,10 +312,15 @@ void networkdialogcallbacktype(newtComponent cm, void *data)
    	newtEntrySetFlags(netmaskentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_RESET);
    }
    if (strcmp(type, "DHCP") == 0)
+	{
    	newtEntrySetFlags(dhcphostnameentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_RESET);
+		newtEntrySetFlags(dhcpforcemtuentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_RESET);
+	}
    else
+	{
    	newtEntrySetFlags(dhcphostnameentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET);		
-		
+		newtEntrySetFlags(dhcpforcemtuentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET);		
+	}
    newtRefresh();
    newtDrawForm(networkform);	
 }
hooks/post-receive
--
IPFire 2.x development tree

    