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, core78 has been updated via 43ea947fb413125d577225f81c138b449c7247f1 (commit) via 602e26a56529ab13a041a2b3e535655a122edff4 (commit) via 6a27e0b06ab907e852b6b87eaf83927439f06b7d (commit) via ad59362fc738803014b35c22f12ba32b72010bd8 (commit) via ddd47deaa3de5b50bc29415a9f41c5c1c26a7e53 (commit) via f4e9a251168732fb30358402a5d5ca1b4b572698 (commit) via e0d208c5f4ea8a33b0c9bfe221090a0c961de82d (commit) via 1efa8995ebe9bb911d6575b6587c0600187572ae (commit) via a545f88e402a62d1b90a929b0e6622ae6eeeb143 (commit) from eab3759a854442a3846548c9bae62539764796c0 (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 43ea947fb413125d577225f81c138b449c7247f1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Jun 4 19:55:59 2014 +0200

core78: add more changed files to updater.

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

Summary of changes: config/etc/group | 2 +- config/rootfiles/common/hostname | 9 +++ config/rootfiles/common/net-tools | 9 --- config/rootfiles/core/78/filelists/files | 3 + config/rootfiles/core/78/filelists/hostname | 1 + .../rootfiles/core/78/filelists/perl-Device-Modem | 1 + .../core/78/filelists/perl-Device-SerialPort | 1 + config/rootfiles/core/78/update.sh | 3 + config/rootfiles/packages/icinga | 2 +- lfs/{arping => hostname} | 11 ++-- lfs/net-tools | 1 + lfs/squidclamav | 4 +- lfs/transmission | 8 +-- make.sh | 1 + src/patches/hostname-rh.patch | 69 ++++++++++++++++++++++ .../squidclamav-5.11-squid-helper-protocol.patch | 10 ++-- 16 files changed, 108 insertions(+), 27 deletions(-) create mode 100644 config/rootfiles/common/hostname create mode 120000 config/rootfiles/core/78/filelists/hostname create mode 120000 config/rootfiles/core/78/filelists/perl-Device-Modem create mode 120000 config/rootfiles/core/78/filelists/perl-Device-SerialPort copy lfs/{arping => hostname} (92%) create mode 100644 src/patches/hostname-rh.patch

Difference in files: diff --git a/config/etc/group b/config/etc/group index 46e4b80..ab5f4af 100644 --- a/config/etc/group +++ b/config/etc/group @@ -10,7 +10,7 @@ kmem:x:9: wheel:x:10:root mail:x:12:mail uucp:x:14: -dialout:x:16: +dialout:x:16:nobody floppy:x:19: tape:x:20: utmp:x:22: diff --git a/config/rootfiles/common/hostname b/config/rootfiles/common/hostname new file mode 100644 index 0000000..7c59b98 --- /dev/null +++ b/config/rootfiles/common/hostname @@ -0,0 +1,9 @@ +bin/dnsdomainname +bin/domainname +bin/hostname +bin/nisdomainname +bin/ypdomainname +#usr/share/man/man1/dnsdomainname.1 +#usr/share/man/man1/domainname.1 +#usr/share/man/man1/nisdomainname.1 +#usr/share/man/man1/ypdomainname.1 diff --git a/config/rootfiles/common/net-tools b/config/rootfiles/common/net-tools index 3cf72ac..4860b2f 100644 --- a/config/rootfiles/common/net-tools +++ b/config/rootfiles/common/net-tools @@ -1,9 +1,4 @@ -bin/dnsdomainname -bin/domainname -bin/hostname bin/netstat -#bin/nisdomainname -#bin/ypdomainname sbin/arp sbin/ifconfig #sbin/ipmaddr @@ -14,10 +9,6 @@ sbin/nameif sbin/rarp sbin/route sbin/slattach -#usr/share/man/man1/dnsdomainname.1 -#usr/share/man/man1/domainname.1 -#usr/share/man/man1/nisdomainname.1 -#usr/share/man/man1/ypdomainname.1 #usr/share/man/man5/ethers.5 #usr/share/man/man8/arp.8 #usr/share/man/man8/ifconfig.8 diff --git a/config/rootfiles/core/78/filelists/files b/config/rootfiles/core/78/filelists/files index 851ce36..c0fa689 100644 --- a/config/rootfiles/core/78/filelists/files +++ b/config/rootfiles/core/78/filelists/files @@ -7,12 +7,15 @@ srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat srv/web/ipfire/cgi-bin/modem-status.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/html/themes/ipfire/include/functions.pl usr/bin/squidGuard +usr/sbin/firewall_policy usr/sbin/redirect_wrapper usr/sbin/updxlrator usr/local/bin/setddns.pl +var/ipfire/header.pl var/ipfire/langs var/ipfire/menu.d/20-status.menu var/ipfire/menu.d/70-log.menu diff --git a/config/rootfiles/core/78/filelists/hostname b/config/rootfiles/core/78/filelists/hostname new file mode 120000 index 0000000..2a96fdd --- /dev/null +++ b/config/rootfiles/core/78/filelists/hostname @@ -0,0 +1 @@ +../../../common/hostname \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/perl-Device-Modem b/config/rootfiles/core/78/filelists/perl-Device-Modem new file mode 120000 index 0000000..ea70f08 --- /dev/null +++ b/config/rootfiles/core/78/filelists/perl-Device-Modem @@ -0,0 +1 @@ +../../../common/perl-Device-Modem \ No newline at end of file diff --git a/config/rootfiles/core/78/filelists/perl-Device-SerialPort b/config/rootfiles/core/78/filelists/perl-Device-SerialPort new file mode 120000 index 0000000..2eb1527 --- /dev/null +++ b/config/rootfiles/core/78/filelists/perl-Device-SerialPort @@ -0,0 +1 @@ +../../../common/perl-Device-SerialPort \ No newline at end of file diff --git a/config/rootfiles/core/78/update.sh b/config/rootfiles/core/78/update.sh index 6564379..f3e0593 100644 --- a/config/rootfiles/core/78/update.sh +++ b/config/rootfiles/core/78/update.sh @@ -173,6 +173,9 @@ chmod 4755 /usr/bin/ping # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"

+# Add nobody to group dialout +usermod -a -G dialout nobody + # # Start services # diff --git a/config/rootfiles/packages/icinga b/config/rootfiles/packages/icinga index caddac3..7a8ae92 100644 --- a/config/rootfiles/packages/icinga +++ b/config/rootfiles/packages/icinga @@ -20,7 +20,7 @@ etc/rc.d/init.d/icinga etc/rc.d/rc0.d/K33icinga etc/rc.d/rc3.d/S67icinga etc/rc.d/rc6.d/K33icinga -#usr/bin/icinga +usr/bin/icinga usr/bin/icingastats #usr/lib/icinga usr/lib/icinga/p1.pl diff --git a/lfs/hostname b/lfs/hostname new file mode 100644 index 0000000..feac3a0 --- /dev/null +++ b/lfs/hostname @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 = 3.15 + +THISAPP = hostname_$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/hostname +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f93c87de2517850de5f47234e3bcb563 + +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 zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/hostname-rh.patch + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install BINDIR=/bin + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/net-tools b/lfs/net-tools index 08b4815..ae4d738 100644 --- a/lfs/net-tools +++ b/lfs/net-tools @@ -69,6 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/net-tools-1.60-no-hostname.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-gcc34-3.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-kernel_headers-3.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-mii_ioctl-1.patch diff --git a/lfs/squidclamav b/lfs/squidclamav index 263826f..697b59a 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2014 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 = squidclamav -PAK_VER = 18 +PAK_VER = 19

DEPS = "clamav"

diff --git a/lfs/transmission b/lfs/transmission index 51c2fbd..cb4ad45 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2014 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,7 +24,7 @@

include Config

-VER = 2.82 +VER = 2.83

THISAPP = transmission-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = transmission -PAK_VER = 9 +PAK_VER = 10

DEPS = "libevent2"

@@ -46,7 +46,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = a5ef870c0410b12d10449c2d36fa4661 +$(DL_FILE)_MD5 = 4620cfbfefee2ce55a6fa12c3ec330a7

install : $(TARGET)

diff --git a/make.sh b/make.sh index 041a0f6..c170076 100755 --- a/make.sh +++ b/make.sh @@ -355,6 +355,7 @@ buildbase() { lfsmake2 groff lfsmake2 gperf lfsmake2 gzip + lfsmake2 hostname lfsmake2 iproute2 lfsmake2 jwhois lfsmake2 kbd diff --git a/src/patches/hostname-rh.patch b/src/patches/hostname-rh.patch new file mode 100644 index 0000000..d56ae59 --- /dev/null +++ b/src/patches/hostname-rh.patch @@ -0,0 +1,69 @@ +diff -up hostname/Makefile.rh hostname/Makefile +--- hostname/Makefile.rh 2013-11-04 10:12:59.670379153 +0100 ++++ hostname/Makefile 2013-11-04 10:15:04.957314495 +0100 +@@ -10,21 +10,17 @@ OBJS=hostname.o + + hostname: $(OBJS) + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) -lnsl +- ln -fs hostname dnsdomainname +- ln -fs hostname domainname +- ln -fs hostname ypdomainname +- ln -fs hostname nisdomainname + + install: hostname + install -d ${BASEDIR}$(MANDIR)/man1 +- install -o root -g root -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1 ++ install -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/dnsdomainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/domainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/ypdomainname.1 + ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/nisdomainname.1 + + install -d ${BASEDIR}$(BINDIR) +- install -o root -g root -m 0755 hostname ${BASEDIR}$(BINDIR) ++ install -m 0755 hostname ${BASEDIR}$(BINDIR) + ln -fs hostname ${BASEDIR}$(BINDIR)/dnsdomainname + ln -fs hostname ${BASEDIR}$(BINDIR)/domainname + ln -fs hostname ${BASEDIR}$(BINDIR)/nisdomainname +diff -up hostname/hostname.1.rh hostname/hostname.1 +--- hostname/hostname.1.rh 2013-11-03 15:24:23.000000000 +0100 ++++ hostname/hostname.1 2013-11-04 10:12:59.670379153 +0100 +@@ -80,6 +80,28 @@ complete FQDN of the system is returned + .B "THE FQDN" + below). + ++.LP ++The function ++.BR gethostname(2) ++is used to get the hostname. When the ++.BR "hostname -a, -d, -f or -i" ++is called will ++.BR gethostbyname(3) ++be called. The difference in ++.BR gethostname(2) ++and ++.BR gethostbyname(3) ++is that ++.BR gethostbyname(3) ++is network aware, so it consults ++.IR /etc/nsswitch.conf ++and ++.IR /etc/host.conf ++to decide whether to read information in ++.IR /etc/hostname ++or ++.IR /etc/hosts ++ + .SS "SET NAME" + When called with one argument or with the + .B --file +@@ -105,8 +127,7 @@ command (see + .B "THE FQDN" + below). + .LP +-The host name is usually set once at system startup in +-.I /etc/init.d/hostname.sh ++The host name is usually set once at system startup + (normally by reading the contents of a file which contains + the host name, e.g. + .IR /etc/hostname ). diff --git a/src/patches/squidclamav-5.11-squid-helper-protocol.patch b/src/patches/squidclamav-5.11-squid-helper-protocol.patch index 0bdb21b..e64bcaf 100644 --- a/src/patches/squidclamav-5.11-squid-helper-protocol.patch +++ b/src/patches/squidclamav-5.11-squid-helper-protocol.patch @@ -1,6 +1,6 @@ -diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidclamav.c ---- squidclamav-5.11-vanilla/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100 -+++ squidclamav-5.11/src/squidclamav.c 2014-06-02 15:19:05.463465297 +0200 +diff -Naur squidclamav-5.11.org/src/squidclamav.c squidclamav-5.11/src/squidclamav.c +--- squidclamav-5.11.org/src/squidclamav.c 2012-10-29 09:46:06.000000000 +0100 ++++ squidclamav-5.11/src/squidclamav.c 2014-06-03 12:26:36.215696508 +0200 @@ -483,7 +483,7 @@ aren't appropriate, then just echo back the line from stdin */ if (buff_status == 1) { @@ -61,7 +61,7 @@ diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidc } - fprintf (stdout, "%s %s %s %s\n", urlredir, - in_buff.src_address, in_buff.ident, in_buff.method); -+ fprintf (stdout, "OK status=302 url="%s"\n", urlredir); ++ fprintf (stdout, "OK rewrite-url="%s"\n", urlredir); fflush(stdout); xfree(urlredir); if (debug != 0) @@ -170,7 +170,7 @@ diff -Nur squidclamav-5.11-vanilla/src/squidclamav.c squidclamav-5.11/src/squidc } - fprintf (stdout, "%s %s %s %s\n", urlredir, - in_buff.src_address, in_buff.ident, in_buff.method); -+ fprintf (stdout, "OK status=302 url="%s"\n", urlredir); ++ fprintf (stdout, "OK rewrite-url="%s"\n", urlredir); fflush(stdout); xfree(urlredir); if (debug != 0)

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