jer 14/07/18 14:06:37
Modified: nufw-2.2.21-fix-gnutls.patch nufw-conf.d
nuauth-init.d nuauth-conf.d nufw-init.d
Added: nufw-2.2.22-var-run.patch
Log:
Marked ~amd64 too. Use /run not /var/run. USE=pam_nuauth requires
USE=plaintext.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.2 net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch?r1=1.1&r2=1.2
Index: nufw-2.2.21-fix-gnutls.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nufw-2.2.21-fix-gnutls.patch 2 Aug 2009 17:50:24 -0000 1.1
+++ nufw-2.2.21-fix-gnutls.patch 18 Jul 2014 14:06:37 -0000 1.2
@@ -1,6 +1,5 @@
-diff -ru nufw-2.2.21~/configure.ac nufw-2.2.21/configure.ac
---- nufw-2.2.21~/configure.ac 2009-08-02 19:39:52.000000000 +0200
-+++ nufw-2.2.21/configure.ac 2009-08-02 19:42:38.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
@@ -87,6 +87,7 @@
#AM_CHECK_PATH([libgcrypt],
[gcry_md_open],AC_DEFINE([HAVE_LIBRARY_GCRYPT],[1],[Gcrypt lib flag]),
check_gcrypt=no,[-L/usr/local/lib])
#AM_CHECK_PATH(libgnutls],
[gnutls_init],AC_DEFINE([HAVE_LIBRARY_GNUTLS],[1],[Gnutls lib flag]),
check_gnutls=no)
1.2 net-firewall/nufw/files/nufw-conf.d
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nufw-conf.d?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nufw-conf.d?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nufw-conf.d?r1=1.1&r2=1.2
Index: nufw-conf.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/nufw/files/nufw-conf.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nufw-conf.d 13 Nov 2006 22:36:25 -0000 1.1
+++ nufw-conf.d 18 Jul 2014 14:06:37 -0000 1.2
@@ -1,2 +1,2 @@
-
+# configuration file for /etc/init.d/nufw
NUFW_OPTIONS="-k /etc/nufw/nufw.key -c /etc/nufw/nufw.pem -d 127.0.0.1 -p 4129"
1.2 net-firewall/nufw/files/nuauth-init.d
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nuauth-init.d?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nuauth-init.d?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nuauth-init.d?r1=1.1&r2=1.2
Index: nuauth-init.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/nufw/files/nuauth-init.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nuauth-init.d 13 Nov 2006 22:36:25 -0000 1.1
+++ nuauth-init.d 18 Jul 2014 14:06:37 -0000 1.2
@@ -13,6 +13,7 @@
}
start() {
+ checkpath -d /run/nuauth
checkconfig || return 1
ebegin "Starting nuauth"
start-stop-daemon --start --quiet --exec /usr/sbin/nuauth -- -D
${NUAUTH_OPTIONS}
@@ -21,6 +22,6 @@
stop() {
ebegin "Stopping nuauth"
- start-stop-daemon --stop --quiet --pidfile
/var/run/nuauth/nuauth.pid
+ start-stop-daemon --stop --quiet --pidfile
/run/nuauth/nuauth.pid
eend $?
}
1.2 net-firewall/nufw/files/nuauth-conf.d
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nuauth-conf.d?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nuauth-conf.d?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nuauth-conf.d?r1=1.1&r2=1.2
Index: nuauth-conf.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/nufw/files/nuauth-conf.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nuauth-conf.d 13 Nov 2006 22:36:25 -0000 1.1
+++ nuauth-conf.d 18 Jul 2014 14:06:37 -0000 1.2
@@ -1,2 +1,2 @@
-
+# configuration file for /etc/init.d/nuauth
NUAUTH_OPTIONS=""
1.2 net-firewall/nufw/files/nufw-init.d
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nufw-init.d?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nufw-init.d?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nufw-init.d?r1=1.1&r2=1.2
Index: nufw-init.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/nufw/files/nufw-init.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nufw-init.d 13 Nov 2006 22:36:25 -0000 1.1
+++ nufw-init.d 18 Jul 2014 14:06:37 -0000 1.2
@@ -12,6 +12,6 @@
stop() {
ebegin "Stopping nufw"
- start-stop-daemon --stop --quiet --pidfile /var/run/nufw.pid
+ start-stop-daemon --stop --quiet --pidfile /run/nufw.pid
eend $?
}
1.1 net-firewall/nufw/files/nufw-2.2.22-var-run.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nufw-2.2.22-var-run.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/nufw/files/nufw-2.2.22-var-run.patch?rev=1.1&content-type=text/plain
Index: nufw-2.2.22-var-run.patch
===================================================================
--- a/src/nuauth/auth_srv.h
+++ b/src/nuauth/auth_srv.h
@@ -162,7 +162,7 @@
#ifdef S_SPLINT_S
# define NUAUTH_PID_FILE "/usr/local/var/run/nuauth/nuauth.pid"
#else
-# define NUAUTH_PID_FILE LOCAL_STATE_DIR "/run/nuauth/nuauth.pid"
+# define NUAUTH_PID_FILE "/run/nuauth/nuauth.pid"
#endif
/* define the number of threads that will do user check */
--- a/src/nuauth/command.c
+++ b/src/nuauth/command.c
@@ -26,7 +26,7 @@
#include <sys/un.h> /* unix socket */
#include <sys/stat.h> /* fchmod() */
-#define SOCKET_FILENAME LOCAL_STATE_DIR "/run/nuauth/nuauth-command.socket"
+#define SOCKET_FILENAME "/run/nuauth/nuauth-command.socket"
const char* COMMAND_HELP =
"version: display nuauth version\n"
--- a/src/nufw/main.c
+++ b/src/nufw/main.c
@@ -54,7 +54,7 @@
/*! Name of pid file prefixed by LOCAL_STATE_DIR (variable defined
* during compilation/installation) */
-#define NUFW_PID_FILE LOCAL_STATE_DIR "/run/nufw.pid"
+#define NUFW_PID_FILE "/run/nufw.pid"
/**
* Stop threads and then wait until threads exit.
--- a/src/nuauth/Makefile.am
+++ b/src/nuauth/Makefile.am
@@ -26,9 +26,6 @@
nuauth_LDADD = $(GLIB_LIBS) -lm -lgnutls -lsasl2 -lnufw
-L$(top_builddir)/src/include/
-install-exec-local:
- install -d "$(DESTDIR)$(localstatedir)/run/nuauth/"
-
nuauth$(EXEEXT): $(nuauth_OBJECTS) $(nuauth_DEPENDENCIES)
@rm -f nuauth$(EXEEXT)
$(LINK) $(nuauth_LDFLAGS) $(nuauth_OBJECTS) $(nuauth_LDADD)
