From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 146636ae7863022e2bdddccac9ef75b8c58d79e0
Date: Mon, 20 Jan 2014 20:24:46 +0100 [thread overview]
Message-ID: <20140120192447.8C40120AEB@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 9366 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 146636ae7863022e2bdddccac9ef75b8c58d79e0 (commit)
via 057652c5e548c5e0b0e4e07559c21b7916335af9 (commit)
via 48cc0e123ac601d0deada6f1feeeb2bae0f6631a (commit)
via cad228f74c10521919dae36192430ed372d08ca8 (commit)
via 6fe7d6799fd682056dd7900ac1fad17e6de194fa (commit)
via 192d43080e3026701b8de77d8b4ae2bf507c993b (commit)
from b872585fda0d01156c20d813413e1b0321aa374b (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 146636ae7863022e2bdddccac9ef75b8c58d79e0
Merge: 057652c 6fe7d67
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jan 20 20:23:12 2014 +0100
Merge remote-tracking branch 'stevee/avahi-fixes' into next
commit 057652c5e548c5e0b0e4e07559c21b7916335af9
Merge: 48cc0e1 cad228f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jan 20 20:22:10 2014 +0100
Merge remote-tracking branch 'trikolon/nginx' into next
commit 48cc0e123ac601d0deada6f1feeeb2bae0f6631a
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Mon Jan 20 20:13:46 2014 +0100
openvpn: Since port must be < 1024 we can drop the conflict check.
All the potentially conflicting ports are smaller than < 1024
and can therefore never be used any way.
commit cad228f74c10521919dae36192430ed372d08ca8
Author: Ben Schweikert <trikolon(a)ipfire.org>
Date: Sun Jan 19 16:01:49 2014 +0100
Nginx: Update to version 1.4.4 (stable version).
commit 6fe7d6799fd682056dd7900ac1fad17e6de194fa
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Jan 19 10:57:48 2014 +0100
glibc: Ship getent binary.
commit 192d43080e3026701b8de77d8b4ae2bf507c993b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Jan 18 23:16:43 2014 +0100
avahi: Fix certain problems.
I've fixed certain problems reported on the bugtracker:
* avahi user and group were missing.
* Runtime dependency "dbus" added.
* Fixed wrong localstatedir.
* Program was not killed correctly by initscript.
Fixes #10338.
-----------------------------------------------------------------------
Summary of changes:
config/avahi/avahi | 2 +-
config/rootfiles/common/i586/glibc | 2 +-
html/cgi-bin/ovpnmain.cgi | 51 +-------------------------------------
lfs/avahi | 22 +++++++++++-----
lfs/nginx | 13 +++-------
src/paks/avahi/install.sh | 7 ++++++
6 files changed, 30 insertions(+), 67 deletions(-)
Difference in files:
diff --git a/config/avahi/avahi b/config/avahi/avahi
index 206146a..7413f56 100755
--- a/config/avahi/avahi
+++ b/config/avahi/avahi
@@ -18,7 +18,7 @@ case "$1" in
stop)
boot_mesg "Stopping avahi..."
- killproc /usr/sbin/avahi-daemon -k
+ /usr/sbin/avahi-daemon -k
;;
reload)
diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc
index d17d7da..5aad2b6 100644
--- a/config/rootfiles/common/i586/glibc
+++ b/config/rootfiles/common/i586/glibc
@@ -49,7 +49,7 @@ sbin/ldconfig
#usr/bin/catchsegv
#usr/bin/gencat
#usr/bin/getconf
-#usr/bin/getent
+usr/bin/getent
#usr/bin/iconv
usr/bin/ldd
#usr/bin/lddlibc4
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index b075cc5..71366cb 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -222,50 +222,6 @@ sub checkportinc
}
}
-# Darren Critchley - certain ports are reserved for IPFire
-# TCP 67,68,81,222,445
-# UDP 67,68
-# Params passed in -> port, rangeyn, protocol
-sub disallowreserved
-{
- # port 67 and 68 same for tcp and udp, don't bother putting in an array
- my $msg = "";
- my @tcp_reserved = (81,222,445);
- my $prt = $_[0]; # the port or range
- my $ryn = $_[1]; # tells us whether or not it is a port range
- my $prot = $_[2]; # protocol
- my $srcdst = $_[3]; # source or destination
- if ($ryn) { # disect port range
- if ($srcdst eq "src") {
- $msg = "$Lang::tr{'rsvd src port overlap'}";
- } else {
- $msg = "$Lang::tr{'rsvd dst port overlap'}";
- }
- my @tmprng = split(/\:/,$prt);
- unless (67 < $tmprng[0] || 67 > $tmprng[1]) { $errormessage="$msg 67"; return; }
- unless (68 < $tmprng[0] || 68 > $tmprng[1]) { $errormessage="$msg 68"; return; }
- if ($prot eq "tcp") {
- foreach my $prange (@tcp_reserved) {
- unless ($prange < $tmprng[0] || $prange > $tmprng[1]) { $errormessage="$msg $prange"; return; }
- }
- }
- } else {
- if ($srcdst eq "src") {
- $msg = "$Lang::tr{'reserved src port'}";
- } else {
- $msg = "$Lang::tr{'reserved dst port'}";
- }
- if ($prt == 67) { $errormessage="$msg 67"; return; }
- if ($prt == 68) { $errormessage="$msg 68"; return; }
- if ($prot eq "tcp") {
- foreach my $prange (@tcp_reserved) {
- if ($prange == $prt) { $errormessage="$msg $prange"; return; }
- }
- }
- }
- return;
-}
-
sub writeserverconf {
my %sovpnsettings = ();
my @temp = ();
@@ -1093,16 +1049,11 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
goto SETTINGS_ERROR;
}
}
- if ($cgiparams{'ENABLED'} eq 'on'){
- &disallowreserved($cgiparams{'DDEST_PORT'},0,$cgiparams{'DPROTOCOL'},"dest");
- }
if ($errormessage) { goto SETTINGS_ERROR; }
-
-
+
if ($cgiparams{'ENABLED'} eq 'on'){
&checkportfw($cgiparams{'DDEST_PORT'},$cgiparams{'DPROTOCOL'});
}
-
if ($errormessage) { goto SETTINGS_ERROR; }
if (! &General::validipandmask($cgiparams{'DOVPN_SUBNET'})) {
diff --git a/lfs/avahi b/lfs/avahi
index 88263a1..0ffbd32 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = avahi
-PAK_VER = 3
+PAK_VER = 4
-DEPS = "libdaemon"
+DEPS = "dbus libdaemon"
###############################################################################
# Top-level Rules
@@ -77,10 +77,20 @@ $(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 --with-avahi-user=avahi \
- --disable-qt3 --disable-qt4 --disable-gtk --disable-gtk3 \
- --disable-pygtk --disable-python-dbus --disable-mono \
- --disable-monodoc --with-distro=none --sysconfdir=/etc
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-avahi-user=avahi \
+ --disable-qt3 \
+ --disable-qt4 \
+ --disable-gtk \
+ --disable-gtk3 \
+ --disable-pygtk \
+ --disable-python-dbus \
+ --disable-mono \
+ --disable-monodoc \
+ --with-distro=none
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cp -avf $(DIR_SRC)/config/avahi/avahi /etc/init.d/
diff --git a/lfs/nginx b/lfs/nginx
index 2b7e626..e2f3c4f 100644
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -24,7 +24,7 @@
include Config
-VER = 1.3.11
+VER = 1.4.4
THISAPP = nginx-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -42,11 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4d299999bca4d2cecfbe48e51684a345
-
-objects += nginx_tcp_proxy_module.tar.bz2
-nginx_tcp_proxy_module.tar.bz2 = $(DL_FROM)/nginx_tcp_proxy_module.tar.bz2
-nginx_tcp_proxy_module.tar.bz2_MD5 = f07898b5b783ef65d416019b51cb1de8
+$(DL_FILE)_MD5 = 5dfaba1cbeae9087f3949860a02caa9f
install : $(TARGET)
@@ -97,12 +93,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--with-imap --with-imap_ssl_module --with-http_ssl_module \
--with-http_stub_status_module \
--with-http_dav_module \
- --with-http_sub_module \
- --add-module=nginx_tcp_proxy_module/
+ --with-http_sub_module
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
mkdir -p /var/log/nginx /var/spool/nginx
cp /usr/src/config/nginx/nginx /etc/init.d/
# chown http:http /var/log/nginx
-# @rm -rf $(DIR_APP)
+ @rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/paks/avahi/install.sh b/src/paks/avahi/install.sh
index bcbb631..cb0266b 100644
--- a/src/paks/avahi/install.sh
+++ b/src/paks/avahi/install.sh
@@ -22,6 +22,13 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
+
+# Create Username and group.
+getent group avahi >/dev/null || groupadd -r avahi
+getent passwd avahi >/dev/null || \
+ useradd -r -g avahi -d /var/run/avahi-daemon -s /sbin/nologin \
+ -c "Avahi mDNS daemon" avahi
+
extract_files
ln -svf ../init.d/avahi /etc/rc.d/rc3.d/S65avahi
ln -svf ../init.d/avahi /etc/rc.d/rc0.d/K35avahi
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-01-20 19:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140120192447.8C40120AEB@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox