sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build with WITH_PAM. Quite hacky and will be reimplement some time.

Browse source 
- Simplify patch-cvs-6-pidfile_mask. It's enough to hard code 0644 as
  parmissions for a pidfile.

Approved by:	maintainer
This commit is contained in:
Sergey Matveychuk 2007-10-17 12:08:58 +00:00
parent ff211f28d0
commit 123a9758de
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=201619
3 changed files with 53 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/quagga/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= quagga
PORTVERSION= 0.99.9
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= net ipv6
MASTER_SITES= http://quagga.net/download/ \
http://www.ru.quagga.net/download/ \

97
net/quagga/files/patch-cvs-6-pidfile_mask
View file

@ -1,35 +1,14 @@
--- configure.ac 7 Sep 2007 16:54:01 -0000 1.139
+++ configure.ac 2 Oct 2007 13:01:49 -0000
@@ -233,6 +233,8 @@
[ --enable-configfile-mask=ARG set mask for config files])
AC_ARG_ENABLE(logfile_mask,
[ --enable-logfile-mask=ARG set mask for log files])
+AC_ARG_ENABLE(pidfile_mask,
+[ --enable-pidfile-mask=ARG set mask for PID files])
--- lib/pid_output.c 17 Dec 2004 20:50:00 -0000 1.9
+++ lib/pid_output.c 4 Oct 2007 15:07:57 -0000
@@ -25,6 +25,7 @@
#include <log.h>
#include "version.h"
AC_ARG_ENABLE(rtadv,
[ --disable-rtadv disable IPV6 router advertisement feature])
@@ -344,6 +346,9 @@
enable_logfile_mask=${enable_logfile_mask:-0600}
AC_DEFINE_UNQUOTED(LOGFILE_MASK, ${enable_logfile_mask}, Mask for log files)
+#define PIDFILE_MASK 0644
#ifndef HAVE_FCNTL
+enable_pidfile_mask=${enable_pidfile_mask:-0600}
+AC_DEFINE_UNQUOTED(PIDFILE_MASK, ${enable_pidfile_mask}, Mask for PID files)
+
MULTIPATH_NUM=1
case "${enable_multipath}" in
@@ -1461,6 +1466,7 @@
group for vty sockets : ${enable_vty_group}
config file mask : ${enable_configfile_mask}
log file mask : ${enable_logfile_mask}
+PID file mask : ${enable_pidfile_mask}
The above user and group must have read/write access to the state file
directory and to the config files in the config file directory."
--- lib/pid_output.c 17 Dec 2004 20:50:00 -0000 1.9
+++ lib/pid_output.c 2 Oct 2007 13:01:49 -0000
@@ -36,7 +36,7 @@
pid_t
@@ -36,7 +37,7 @@ pid_output (const char *path)
pid = getpid();
@ -38,7 +17,7 @@
fp = fopen (path, "w");
if (fp != NULL)
{
@@ -67,8 +67,8 @@
@@ -67,8 +68,8 @@ pid_output (const char *path)
pid = getpid ();
@ -49,59 +28,3 @@
if (fd < 0)
{
zlog_err("Can't create pid lock file %s (%s), exiting",
--- config.h.in Fri Sep 7 20:56:20 2007
+++ config.h.in Wed Oct 3 11:02:58 2007
@@ -602,6 +602,9 @@
/* zebra PID */
#undef PATH_ZEBRA_PID
+/* Mask for PID files */
+#undef PIDFILE_MASK
+
/* Quagga Group */
#undef QUAGGA_GROUP
--- configure Fri Sep 7 20:54:55 2007
+++ configure Wed Oct 3 11:02:51 2007
@@ -1557,6 +1557,7 @@
--enable-vty-group=ARG set vty sockets to have specified group as owner
--enable-configfile-mask=ARG set mask for config files
--enable-logfile-mask=ARG set mask for log files
+ --enable-pidfile-mask=ARG set mask for PID files
--disable-rtadv disable IPV6 router advertisement feature
--enable-irdp enable IRDP server support in zebra
--enable-isis-topology enable IS-IS topology generator
@@ -19976,6 +19891,11 @@
enableval=$enable_logfile_mask;
fi
+# Check whether --enable-pidfile_mask was given.
+if test "${enable_pidfile_mask+set}" = set; then
+ enableval=$enable_pidfile_mask;
+fi
+
# Check whether --enable-rtadv was given.
if test "${enable_rtadv+set}" = set; then
@@ -20177,6 +20097,13 @@
_ACEOF
+enable_pidfile_mask=${enable_pidfile_mask:-0600}
+
+cat >>confdefs.h <<_ACEOF
+#define PIDFILE_MASK ${enable_pidfile_mask}
+_ACEOF
+
+
MULTIPATH_NUM=1
case "${enable_multipath}" in
@@ -35773,6 +35700,7 @@
group for vty sockets : ${enable_vty_group}
config file mask : ${enable_configfile_mask}
log file mask : ${enable_logfile_mask}
+PID file mask : ${enable_pidfile_mask}
The above user and group must have read/write access to the state file
directory and to the config files in the config file directory."

42
net/quagga/files/patch-fix-autotools Normal file
View file

@ -0,0 +1,42 @@
--- Makefile.in.orig 2007-10-16 14:26:18.000000000 +0400
+++ Makefile.in 2007-10-16 14:25:58.000000000 +0400
@@ -244,39 +244,6 @@
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-am--refresh:
- @:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- cd $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
@if test ! -f $@; then \