ports/94108: Update port: net/openser
Jesus Rodriguez
jesusr at voztele.com
Sun Mar 5 20:42:13 UTC 2006
On Sun, 5 Mar 2006, FreeBSD-gnats-submit at FreeBSD.org wrote:
Hello,
> Thank you very much for your problem report.
> It has the internal identification `ports/94108'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs.
>
> You can access the state of your problem report at any time
> via this link:
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=94108
>
>> Category: ports
>> Responsible: freebsd-ports-bugs
>> Synopsis: Update port: net/openser
>> Arrival-Date: Sun Mar 05 20:40:03 GMT 2006
Sorry, forgot to send the diff for the update. Here it is.
Thanks.
Saludos
JesusR.
-------------------------------
Jesus Rodriguez
VozTelecom Sistemas, S.L.
jesusr at voztele.com
http://www.voztele.com
Tel. 902360305
-------------------------------
-------------- next part --------------
diff -ur openser/Makefile opensernew/Makefile
--- openser/Makefile Mon Nov 28 02:38:23 2005
+++ opensernew/Makefile Sun Mar 5 21:33:40 2006
@@ -6,7 +6,7 @@
#
PORTNAME= openser
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= net
MASTER_SITES= http://openser.org/pub/openser/${PORTVERSION}/src/
DISTNAME= ${PORTNAME}-${PORTVERSION}-tls_src
@@ -26,7 +26,7 @@
PTHREAD_LIBS="${PTHREAD_LIBS}"
PLIST_FILES= sbin/openser sbin/openser_gen_ha1 sbin/openser_mysql.sh \
- sbin/openserctl sbin/openserunix
+ sbin/openserctl sbin/openserunix sbin/openser_postgresql.sh
PLIST_DIRS= lib/openser/modules lib/openser
MODULES= acc alias_db auth auth_db auth_diameter avpops cpl-c dbtext \
@@ -55,10 +55,6 @@
TLS "TLS support" on
.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-BROKEN= "the postgres module does not build on non-i386"
-.endif
.if defined(WITH_MYSQL)
USE_MYSQL= yes
diff -ur openser/distinfo opensernew/distinfo
--- openser/distinfo Wed Jan 25 10:49:17 2006
+++ opensernew/distinfo Sun Mar 5 01:22:06 2006
@@ -1,3 +1,3 @@
-MD5 (openser-1.0.0-tls_src.tar.gz) = d56814cc463d5ecd563c3ebee9feaa28
-SHA256 (openser-1.0.0-tls_src.tar.gz) = 0e2dbb17fcc9587b53f533995aecf279001ac5877ea1f76bfb55e3b52e60e21e
-SIZE (openser-1.0.0-tls_src.tar.gz) = 1360975
+MD5 (openser-1.0.1-tls_src.tar.gz) = cce062bfc253f31991f6291b6b3a2251
+SHA256 (openser-1.0.1-tls_src.tar.gz) = d0f0612e222de76be5d4be8c436f8a8520d38923659708c67ecaa4a31b1a70d2
+SIZE (openser-1.0.1-tls_src.tar.gz) = 1369316
diff -ur openser/files/patch-Makefile opensernew/files/patch-Makefile
--- openser/files/patch-Makefile Tue Nov 8 02:35:42 2005
+++ opensernew/files/patch-Makefile Sun Mar 5 20:40:13 2006
@@ -1,20 +1,24 @@
---- Makefile.orig Fri Oct 28 23:27:18 2005
-+++ Makefile Sun Oct 30 22:14:24 2005
+--- Makefile.orig Sun Mar 5 19:40:19 2006
++++ Makefile Sun Mar 5 20:40:04 2006
@@ -46,7 +46,7 @@
skip_modules?=
# if not set on the cmd. line or the env, exclude this modules:
-exclude_modules?= jabber cpl-c pa postgres mysql \
-+exclude_modules?= jabber $(POSTGRESQL) $(MYSQL) \
++exclude_modules?= jabber $(POSTGRESQL) $(MYSQL) \
avp_radius auth_radius group_radius uri_radius
# always exclude the CVS dir
override exclude_modules+= CVS $(skip_modules)
-@@ -320,17 +320,9 @@
+@@ -320,21 +320,9 @@
# note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
install-cfg: $(cfg-prefix)/$(cfg-dir)
- sed -e "s#/usr/.*lib/$(NAME)/modules/#$(modules-target)#g" \
-- < etc/$(NAME).cfg > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample
+- < etc/$(NAME).cfg > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0
+- sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg-prefix)/$(cfg-dir)tls/#g" \
+- < $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0 \
+- > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample
+- rm -fr $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0
- chmod 644 $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample
- if [ -z "${skip_cfg_install}" -a \
- ! -f $(cfg-prefix)/$(cfg-dir)$(NAME).cfg ]; then \
@@ -28,9 +32,9 @@
#$(INSTALL-CFG) etc/$(NAME).cfg $(cfg-prefix)/$(cfg-dir)
if [ -z $(TLS) ]; then \
echo "No TLS scripts installed" ; \
-@@ -341,36 +333,16 @@
- mkdir $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private ; \
- mkdir $(cfg-prefix)/$(cfg-dir)/tls/user ; \
+@@ -345,25 +333,7 @@
+ mkdir -p $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private ; \
+ mkdir -p $(cfg-prefix)/$(cfg-dir)/tls/user ; \
$(INSTALL-TOUCH) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \
- $(INSTALL) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \
- $(INSTALL-TOUCH) etc/tls/rootCA/index.txt $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \
@@ -45,7 +49,7 @@
- $(INSTALL) etc/tls/rootCA/private/cakey.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private/; \
- $(INSTALL-TOUCH) etc/tls/user/user-calist.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
- $(INSTALL) etc/tls/user/user-calist.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
-- $(INSTALL-TOUCH) etc/tls/user/user-cert.pem $(cfg-prefix)/$(cfg-dir)/tls/users/; \
+- $(INSTALL-TOUCH) etc/tls/user/user-cert.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
- $(INSTALL) etc/tls/user/user-cert.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
- $(INSTALL-TOUCH) etc/tls/user/user-privkey.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
- $(INSTALL) etc/tls/user/user-privkey.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \
@@ -55,27 +59,35 @@
fi
install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1 utils/$(NAME)unix/$(NAME)unix
- $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)
- $(INSTALL-BIN) $(NAME) $(bin-prefix)/$(bin-dir)
- $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/sc
-- $(INSTALL-BIN) scripts/sc $(bin-prefix)/$(bin-dir)
-- mv -f $(bin-prefix)/$(bin-dir)/sc $(bin-prefix)/$(bin-dir)/$(NAME)ctl
-+ $(BSD_INSTALL_SCRIPT) scripts/sc $(bin-prefix)/$(bin-dir)/$(NAME)ctl
- $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/mysqldb.sh
-- $(INSTALL-BIN) scripts/mysqldb.sh $(bin-prefix)/$(bin-dir)
-- mv -f $(bin-prefix)/$(bin-dir)/mysqldb.sh $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh
-+ $(BSD_INSTALL_SCRIPT) scripts/mysqldb.sh $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh
+@@ -372,17 +342,17 @@
+ sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#g" \
+ < scripts/sc > /tmp/$(NAME)ctl
+ $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)ctl
+- $(INSTALL-BIN) /tmp/$(NAME)ctl $(bin-prefix)/$(bin-dir)
++ $(BSD_INSTALL_SCRIPT) /tmp/$(NAME)ctl $(bin-prefix)/$(bin-dir)
+ rm -fr /tmp/$(NAME)ctl
+ sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#g" \
+ < scripts/mysqldb.sh > /tmp/$(NAME)_mysql.sh
+ $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh
+- $(INSTALL-BIN) /tmp/$(NAME)_mysql.sh $(bin-prefix)/$(bin-dir)
++ $(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_mysql.sh $(bin-prefix)/$(bin-dir)
+ rm -fr /tmp/$(NAME)_mysql.sh
+ sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#g" \
+ < scripts/postgresqldb.sh > /tmp/$(NAME)_postgresql.sh
+ $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_postgresql.sh
+- $(INSTALL-BIN) /tmp/$(NAME)_postgresql.sh $(bin-prefix)/$(bin-dir)
++ $(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_postgresql.sh $(bin-prefix)/$(bin-dir)
+ rm -fr /tmp/$(NAME)_postgresql.sh
$(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_gen_ha1
$(INSTALL-BIN) utils/gen_ha1/gen_ha1 $(bin-prefix)/$(bin-dir)/$(NAME)_gen_ha1
- $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)unix
-@@ -418,9 +390,7 @@
+@@ -431,9 +401,7 @@
if [ -f modules/"$$r"/README ]; then \
$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README ; \
$(INSTALL-DOC) modules/"$$r"/README \
- $(doc-prefix)/$(doc-dir)/README ; \
- mv -f $(doc-prefix)/$(doc-dir)/README \
- $(doc-prefix)/$(doc-dir)/README."$$r" ; \
-+ $(doc-prefix)/$(doc-dir)/README."$$r" ; \
++ $(doc-prefix)/$(doc-dir)/README."$$r" ; \
fi ; \
fi ; \
done
diff -ur openser/files/patch-Makefile.defs opensernew/files/patch-Makefile.defs
--- openser/files/patch-Makefile.defs Tue Nov 8 02:35:42 2005
+++ opensernew/files/patch-Makefile.defs Sun Mar 5 20:15:15 2006
@@ -1,17 +1,18 @@
---- Makefile.defs.orig Fri Oct 28 18:32:39 2005
-+++ Makefile.defs Sun Oct 30 20:09:02 2005
-@@ -147,13 +147,13 @@
+--- Makefile.defs.orig Sun Mar 5 20:07:55 2006
++++ Makefile.defs Sun Mar 5 20:14:38 2006
+@@ -167,13 +167,13 @@
TAR ?= tar
endif
-INSTALL-TOUCH = touch # used to create the file first (good to
-+INSTALL-TOUCH = : # used to create the file first (good to
- # make solaris install work)
+- # make solaris install work)
-INSTALL-CFG = $(INSTALL) -m 644
-INSTALL-BIN = $(INSTALL) -m 755
-INSTALL-MODULES = $(INSTALL) -m 755
-INSTALL-DOC = $(INSTALL) -m 644
-INSTALL-MAN = $(INSTALL) -m 644
++INSTALL-TOUCH = : # used to create the file first (good to
++ # make solaris install work)
+INSTALL-CFG = $(BSD_INSTALL_DATA)
+INSTALL-BIN = $(BSD_INSTALL_PROGRAM)
+INSTALL-MODULES = $(BSD_INSTALL_PROGRAM)
@@ -20,7 +21,7 @@
#set some vars from the environment (and not make builtins)
CC := $(shell echo "$${CC}")
-@@ -449,7 +449,7 @@
+@@ -471,7 +471,7 @@
found_lock_method=yes
endif
@@ -29,7 +30,7 @@
LDFLAGS=
# setting CFLAGS
ifeq ($(mode), release)
-@@ -970,7 +970,8 @@
+@@ -1046,7 +1046,8 @@
ifneq ($(found_lock_method), yes)
DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems
found_lock_method=yes
@@ -39,7 +40,7 @@
else
LIBS= -lfl #dlopen is in libc
endif
-@@ -1045,10 +1046,15 @@
+@@ -1121,10 +1122,15 @@
endif
endif
More information about the freebsd-ports-bugs
mailing list