jer 14/05/03 15:47:45 Modified: radius.init-r3 Added: freeradius-2.2.5-gentoo.patch Log: Version bump (bug #489958). Use /run not /var/run. Migrate away from python.eclass. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.4 net-dialup/freeradius/files/radius.init-r3 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/freeradius/files/radius.init-r3?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/freeradius/files/radius.init-r3?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/freeradius/files/radius.init-r3?r1=1.3&r2=1.4 Index: radius.init-r3 =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-dialup/freeradius/files/radius.init-r3,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- radius.init-r3 28 Dec 2012 13:08:17 -0000 1.3 +++ radius.init-r3 3 May 2014 15:47:45 -0000 1.4 @@ -1,11 +1,11 @@ #!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/files/radius.init-r3,v 1.3 2012/12/28 13:08:17 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/files/radius.init-r3,v 1.4 2014/05/03 15:47:45 jer Exp $ command=/usr/sbin/radiusd command_args="${RADIUSD_OPTS}" -pidfile="${pidfile:-/var/run/radiusd/radiusd.pid}" +pidfile="${pidfile:-/run/radiusd/radiusd.pid}" extra_started_commands="reload" depend() { @@ -21,6 +21,8 @@ checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \ $(dirname ${pidfile}) /var/log/radius + checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \ + $(dirname ${pidfile}) /run/radius } reload() { 1.1 net-dialup/freeradius/files/freeradius-2.2.5-gentoo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/freeradius/files/freeradius-2.2.5-gentoo.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/freeradius/files/freeradius-2.2.5-gentoo.patch?rev=1.1&content-type=text/plain Index: freeradius-2.2.5-gentoo.patch =================================================================== --- a/raddb/radiusd.conf.in +++ b/raddb/radiusd.conf.in @@ -103,7 +103,7 @@ # make # make install # -libdir = @libdir@ +libdir = @libdir@/freeradius # pidfile: Where to place the PID of the RADIUS server. # --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -12,7 +12,7 @@ @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common install: - $(INSTALL) -d -m 755 $(R)$(libdir) + $(INSTALL) -d -m 755 $(R)$(pkglibdir) @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common clean: --- a/src/modules/rules.mak +++ b/src/modules/rules.mak @@ -122,7 +122,7 @@ $(TARGET).la: $(RLM_SUBDIRS) $(LT_OBJS) $(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION_STRING) \ -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@ \ - -rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS) + -rpath $(pkglibdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS) ####################################################################### # @@ -163,13 +163,11 @@ # Do any module-specific installation. # # If there isn't a TARGET defined, then don't do anything. -# Otherwise, install the libraries into $(libdir) +# Otherwise, install the libraries into $(pkglibdir) # install: @[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL) if [ "x$(TARGET)" != "x" ]; then \ $(LIBTOOL) --mode=install $(INSTALL) -c \ - $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \ - rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \ - ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \ + $(TARGET).la $(R)$(pkglibdir)/$(TARGET).la || exit $$?; \ fi --- a/src/modules/rlm_sql/drivers/rules.mak +++ b/src/modules/rlm_sql/drivers/rules.mak @@ -103,7 +103,7 @@ $(TARGET).la: $(LT_OBJS) $(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION_STRING) \ -module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \ - -rpath $(libdir) $^ $(RLM_SQL_LIBS) + -rpath $(pkglibdir) $^ $(RLM_SQL_LIBS) ####################################################################### # @@ -141,12 +141,10 @@ # Do any module-specific installation. # # If there isn't a TARGET defined, then don't do anything. -# Otherwise, install the libraries into $(libdir) +# Otherwise, install the libraries into $(pkglibdir) # install: if [ "x$(TARGET)" != "x" ]; then \ $(LIBTOOL) --mode=install $(INSTALL) -c \ - $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \ - rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la; \ - ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION_STRING).la || exit $$?; \ + $(TARGET).la $(R)$(pkglibdir)/$(TARGET).la || exit $$?; \ fi --- a/src/lib/Makefile +++ b/src/lib/Makefile @@ -42,7 +42,7 @@ $(TARGET).la: $(LT_OBJS) $(LIBTOOL) --mode=link --tag=CC $(CC) -release $(RADIUSD_VERSION) \ - $(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ + $(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ $(LIBS) $(LT_OBJS): $(INCLUDES) @@ -54,7 +54,5 @@ $(INSTALL) -d -m 755 $(R)$(libdir) $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \ $(R)$(libdir)/$(TARGET).la - rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; - ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la reconfig: --- a/Make.inc.in +++ b/Make.inc.in @@ -10,6 +10,7 @@ sysconfdir = @sysconfdir@ localstatedir = @localstatedir@ libdir = @libdir@ +pkglibdir = @libdir@/freeradius bindir = @bindir@ sbindir = @sbindir@ docdir = @docdir@
