OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Jul-2006 10:01:04
Branch: HEAD Handle: 2006071609010003
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
upgrading package: openser 1.0.1 -> 1.1.0
Summary:
Revision Changes Path
1.2 +16 -5 openpkg-src/openser/openser.patch
1.18 +20 -6 openpkg-src/openser/openser.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 openser.patch
--- openpkg-src/openser/openser.patch 9 Oct 2005 19:27:05 -0000 1.1
+++ openpkg-src/openser/openser.patch 16 Jul 2006 08:01:00 -0000 1.2
@@ -1,12 +1,23 @@
Index: Makefile.defs
---- Makefile.defs.orig 2005-07-01 14:13:43 +0200
-+++ Makefile.defs 2005-10-09 18:37:26 +0200
-@@ -982,6 +982,8 @@
- found_lock_method=yes
- endif
+--- Makefile.defs.orig 2006-07-10 19:57:20 +0200
++++ Makefile.defs 2006-07-16 09:54:39 +0200
+@@ -987,6 +987,8 @@
+
+ endif #mode=release
+LDFLAGS += -L$(prefix)/lib
+LIBS += -lfsl
+ #*FLAGS used for compiling the modules
+ ifeq ($(CC_NAME), gcc)
+@@ -1199,8 +1201,8 @@
+ #add libssl if needed
+ ifneq ($(TLS),)
+-DEFS+= -I$(LOCALBASE)/ssl/include
+-LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto
++DEFS+= -I$(prefix)/include
++LIBS+= -L$(prefix)/lib -lssl -lcrypto
+ endif
+ ifneq ($(found_lock_method), yes)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 openser.spec
--- openpkg-src/openser/openser.spec 5 Jul 2006 07:06:10 -0000 1.17
+++ openpkg-src/openser/openser.spec 16 Jul 2006 08:01:03 -0000 1.18
@@ -23,7 +23,7 @@
##
# package options
-%define V_openser 1.0.1
+%define V_openser 1.1.0
%define V_rtpproxy 20060705-021301
# package information
@@ -37,13 +37,14 @@
Group: Network
License: GPL
Version: %{V_openser}
-Release: 20060705
+Release: 20060716
# package options
%option with_fsl yes
+%option with_ssl no
# list of sources
-Source0:
http://openser.org/pub/openser/%{version}/src/openser-%{V_openser}_src.tar.gz
+Source0:
http://openser.org/pub/openser/%{version}/src/openser-%{V_openser}-tls_src.tar.gz
Source1:
http://openser.org/downloads/snapshots/rtpproxy/rtpproxy-cvs-%{V_rtpproxy}.tgz
Source2: rc.openser
Source3: fsl.openser
@@ -60,6 +61,10 @@
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
+%if "%{with_ssl}" == "yes"
+BuildPreReq: openssl
+PreReq: openssl
+%endif
AutoReq: no
AutoReqProv: no
@@ -76,7 +81,7 @@
url = http://openser.org/pub/openser/
regex = (\d+\.\d+\.\d+)/
url = http://openser.org/pub/openser/__NEWVER__/src/
- regex = openser-(__VER__)_src\.tar\.gz
+ regex = openser-(__VER__)-tls_src\.tar\.gz
}
prog openser:rtpproxy = {
version = %{V_rtpproxy}
@@ -85,25 +90,34 @@
}
%prep
- %setup -q
- %setup -q -T -D -a 1
+ %setup -q -n openser-%{version}-tls
+ %setup -q -n openser-%{version}-tls -T -D -a 1
%patch -p0
%build
# build dependencies
%{l_make} %{l_mflags} \
CC="%{l_cc}" \
+%if "%{with_ssl}" == "yes"
+ TLS=1 \
+%endif
prefix=%{l_prefix} \
dep >/dev/null 2>&1 || true
# build program
%{l_make} %{l_mflags} \
CC="%{l_cc}" \
+%if "%{with_ssl}" == "yes"
+ TLS=1 \
+%endif
prefix=%{l_prefix}
# build modules
%{l_make} %{l_mflags} \
CC="%{l_cc}" \
+%if "%{with_ssl}" == "yes"
+ TLS=1 \
+%endif
prefix=%{l_prefix} \
modules \
skip_modules="mysql jabber"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
