Attachment 53245 Details for Bug 80558 – gnu-radius-gettext.diff

[patch] gnu-radius-gettext.diff

gnu-radius-gettext.diff (text/plain), 5.59 KB, created by Vsevolod Stakhov on 2005-05-03 13:55:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vsevolod Stakhov

Created: 2005-05-03 13:55:40 UTC

Size: 5.59 KB

patch

obsolete

>diff -ruNP gnu-radius.orig/Makefile gnu-radius/Makefile
>--- gnu-radius.orig/Makefile	Tue May  3 16:12:38 2005
>+++ gnu-radius/Makefile	Tue May  3 16:42:37 2005
>@@ -25,6 +25,7 @@
> GNU_CONFIGURE=	yes
> USE_LIBTOOL_VER=	15
> INSTALLS_SHLIB=	yes
>+USE_GETTEXT=	yes
> CONFIGURE_TARGET=	# empty
> 
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
>@@ -51,9 +52,7 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if defined(WITH_SNMP) && !defined(DISABLE_VULNERABILITIES)
>-BROKEN=		There is known vulnerability in snmp code of gnu-radius.
>-.elif defined(WITH_SNMP) && defined(DISABLE_VULNERABILITIES)
>+.if defined(WITH_SNMP)
> CONFIGURE_ARGS+=	--enable-snmp
> .endif
> 
>diff -ruNP gnu-radius.orig/files/patch-intl::Makefile.in gnu-radius/files/patch-intl::Makefile.in
>--- gnu-radius.orig/files/patch-intl::Makefile.in	Thu Jan  1 03:00:00 1970
>+++ gnu-radius/files/patch-intl::Makefile.in	Tue May  3 16:42:37 2005
>@@ -0,0 +1,103 @@
>+--- intl/Makefile.in.orig	Tue May  3 16:14:12 2005
>++++ intl/Makefile.in	Tue May  3 16:22:23 2005
>+@@ -123,7 +123,7 @@
>+   osdep.$lo \
>+   intl-compat.$lo
>+ DISTFILES.common = Makefile.in \
>+-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
>++ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
>+ DISTFILES.generated = plural.c
>+ DISTFILES.normal = VERSION
>+ DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
>+@@ -132,7 +132,7 @@
>+ COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
>+ 
>+ all: all-@USE_INCLUDED_LIBINTL@
>+-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
>++all-yes: libintl.$la libintl.h ref-add.sed ref-del.sed
>+ all-no: all-no-@BUILD_INCLUDED_LIBINTL@
>+ all-no-yes: libgnuintl.$la
>+ all-no-no:
>+@@ -229,10 +229,6 @@
>+ libintl.h: libgnuintl.h
>+ 	cp libgnuintl.h libintl.h
>+ 
>+-charset.alias: $(srcdir)/config.charset
>+-	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
>+-	mv t-$@ $@
>+-
>+ check: all
>+ 
>+ # We must not install the libintl.h/libintl.a files if we are on a
>+@@ -271,30 +267,6 @@
>+ 	fi
>+ 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
>+ 	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
>+-	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
>+-	  dest=$(DESTDIR)$(libdir)/charset.alias; \
>+-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
>+-	    orig=$(DESTDIR)$(libdir)/charset.alias; \
>+-	    sed -f ref-add.sed $$orig > $$temp; \
>+-	    $(INSTALL_DATA) $$temp $$dest; \
>+-	    rm -f $$temp; \
>+-	  else \
>+-	    if test @GLIBC21@ = no; then \
>+-	      orig=charset.alias; \
>+-	      sed -f ref-add.sed $$orig > $$temp; \
>+-	      $(INSTALL_DATA) $$temp $$dest; \
>+-	      rm -f $$temp; \
>+-	    fi; \
>+-	  fi; \
>+-	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
>+-	  test -f $(DESTDIR)$(localedir)/locale.alias \
>+-	    && orig=$(DESTDIR)$(localedir)/locale.alias \
>+-	    || orig=$(srcdir)/locale.alias; \
>+-	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
>+-	  dest=$(DESTDIR)$(localedir)/locale.alias; \
>+-	  sed -f ref-add.sed $$orig > $$temp; \
>+-	  $(INSTALL_DATA) $$temp $$dest; \
>+-	  rm -f $$temp; \
>+ 	else \
>+ 	  : ; \
>+ 	fi
>+@@ -308,7 +280,6 @@
>+ 	    $(INSTALL_DATA) $(srcdir)/$$file \
>+ 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
>+ 	  done; \
>+-	  chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
>+ 	  dists="$(DISTFILES.generated)"; \
>+ 	  for file in $$dists; do \
>+ 	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
>+@@ -365,32 +336,6 @@
>+ 	if test "$(PACKAGE)" = "gettext-tools" \
>+ 	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
>+ 	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
>+-	else \
>+-	  : ; \
>+-	fi
>+-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
>+-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
>+-	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
>+-	    dest=$(DESTDIR)$(libdir)/charset.alias; \
>+-	    sed -f ref-del.sed $$dest > $$temp; \
>+-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
>+-	      rm -f $$dest; \
>+-	    else \
>+-	      $(INSTALL_DATA) $$temp $$dest; \
>+-	    fi; \
>+-	    rm -f $$temp; \
>+-	  fi; \
>+-	  if test -f $(DESTDIR)$(localedir)/locale.alias; then \
>+-	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
>+-	    dest=$(DESTDIR)$(localedir)/locale.alias; \
>+-	    sed -f ref-del.sed $$dest > $$temp; \
>+-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
>+-	      rm -f $$dest; \
>+-	    else \
>+-	      $(INSTALL_DATA) $$temp $$dest; \
>+-	    fi; \
>+-	    rm -f $$temp; \
>+-	  fi; \
>+ 	else \
>+ 	  : ; \
>+ 	fi
>diff -ruNP gnu-radius.orig/pkg-plist gnu-radius/pkg-plist
>--- gnu-radius.orig/pkg-plist	Tue May  3 16:12:38 2005
>+++ gnu-radius/pkg-plist	Tue May  3 16:42:37 2005
>@@ -53,17 +53,14 @@
> include/radius/symtab.h
> include/radius/types.h
> lib/libgnuradius.a
>-lib/libgnuradius.la
> lib/libgnuradius.so
> lib/libgnuradius.so.0
> %%GUILE%%bin/radsession
> %%GUILE%%lib/libradscm.a
>-%%GUILE%%lib/libradscm.la
> %%GUILE%%lib/libradscm.so
> %%GUILE%%lib/libradscm.so.0
> %%CLIENT%%lib/libservscm.a
> %%CLIENT%%lib/security/pam_radius.a
>-%%CLIENT%%lib/security/pam_radius.la
> %%CLIENT%%lib/security/pam_radius.so
> %%CLIENT%%libexec/nas.scm
> share/locale/ca/LC_MESSAGES/radius.mo
>@@ -78,11 +75,8 @@
> %%DATADIR%%/%%PORTVERSION%%/rewrite/checknas.rw
> %%DATADIR%%/%%PORTVERSION%%/rewrite/log-hook.rw
> %%DATADIR%%/%%PORTVERSION%%/rewrite/nas-ip.rw
>-%%MYSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/mysql.a
>-%%MYSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/mysql.la
> %%MYSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/mysql.so
> %%PGSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/postgres.a
>-%%PGSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/postgres.la
> %%PGSQL%%%%DATADIR%%/%%PORTVERSION%%/modules/postgres.so
> %%EMACS%%%%EMACS_SITE_LISPDIR%%/radconf-mode.el
> %%EMACS%%%%EMACS_SITE_LISPDIR%%/radius-mode.el

Actions: View | Diff

Attachments on bug 80558: 53244 | 53245