[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
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: 02-Apr-2008 09:45:10
Branch: HEAD Handle: 2008040208450500
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
modifying package: openser-1.3.1 20080401 -> 20080402
Summary:
RevisionChanges Path
1.13+0 -24 openpkg-src/openser/openser.patch
1.65+2 -2 openpkg-src/openser/openser.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
$ cvs diff -u -r1.12 -r1.13 openser.patch
--- openpkg-src/openser/openser.patch 19 Dec 2007 09:55:31 - 1.12
+++ openpkg-src/openser/openser.patch 2 Apr 2008 07:45:05 - 1.13
@@ -63,30 +63,6 @@
}
static void
-@@ -370,10 +374,9 @@
-
- rtpp_log_write(RTPP_LOG_DBUG, cf->glog, "received command \"%s\"", buf);
-
--cp = buf;
- argc = 0;
- memset(argv, 0, sizeof(argv));
--for (ap = argv; (*ap = strsep(&cp, "\r\n\t ")) != NULL;)
-+for (ap = argv, cp = strtok(buf, "\r\n\t "); (cp = strtok(NULL, "\r\n\t
")) != NULL;)
- if (**ap != '\0') {
- argc++;
- if (++ap >= &argv[10])
-@@ -665,7 +668,11 @@
- }
- } else {
- rtpp_log_write(RTPP_LOG_ERR, cf->glog, "getaddrinfo: %s",
-+#if defined(__sun__)
-+ "unknown");
-+#else
- gai_strerror(n));
-+#endif
- }
- }
- }
@@ -1265,7 +1272,7 @@
if (cf->umode == 0) {
unlink(cmd_sock);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.spec
$ cvs diff -u -r1.64 -r1.65 openser.spec
--- openpkg-src/openser/openser.spec 1 Apr 2008 19:22:28 - 1.64
+++ openpkg-src/openser/openser.spec 2 Apr 2008 07:45:05 - 1.65
@@ -23,7 +23,7 @@
# package options
%define V_openser 1.3.1
-%define V_rtpproxy 20080401-101701
+%define V_rtpproxy 20080402-021701
# package information
Name: openser
@@ -36,7 +36,7 @@
Group:VoIP
License: GPL
Version: %{V_openser}
-Release: 20080401
+Release: 20080402
# package options
%option with_fsl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
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: 19-Dec-2007 10:55:31
Branch: HEAD Handle: 2007121909553100
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
modifying package: openser-1.3.0 20071213 -> 20071219
Summary:
RevisionChanges Path
1.12+13 -22 openpkg-src/openser/openser.patch
1.52+2 -2 openpkg-src/openser/openser.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
$ cvs diff -u -r1.11 -r1.12 openser.patch
--- openpkg-src/openser/openser.patch 13 Dec 2007 16:50:14 - 1.11
+++ openpkg-src/openser/openser.patch 19 Dec 2007 09:55:31 - 1.12
@@ -1,6 +1,6 @@
Index: Makefile.defs
--- Makefile.defs.orig 2007-12-13 14:39:06 +0100
-+++ Makefile.defs2007-12-13 17:37:18 +0100
Makefile.defs2007-12-19 10:45:51 +0100
@@ -1018,6 +1018,8 @@
endif #mode=release
@@ -22,8 +22,8 @@
#add libsctp if needed
Index: modules/permissions/parse_config.c
modules/permissions/parse_config.c.orig 2007-08-16 16:22:57 +0200
-+++ modules/permissions/parse_config.c 2007-11-24 19:39:03 +0100
+--- modules/permissions/parse_config.c.orig 2007-12-13 14:38:28 +0100
modules/permissions/parse_config.c 2007-12-19 10:45:51 +0100
@@ -114,8 +114,11 @@
except = strstr(str, " EXCEPT ");
if (except) {
@@ -49,18 +49,9 @@
}
Index: rtpproxy/main.c
rtpproxy/main.c.orig 2007-11-23 11:17:02 +0100
-+++ rtpproxy/main.c 2007-11-24 19:39:55 +0100
-@@ -40,7 +40,7 @@
- #include
- #include
- #include
--#if !defined(__solaris__)
-+#if !defined(__sun__)
- #include
- #endif
- #include
-@@ -113,7 +113,11 @@
+--- rtpproxy/main.c.orig 2007-12-19 03:17:03 +0100
rtpproxy/main.c 2007-12-19 10:45:51 +0100
+@@ -111,7 +111,11 @@
bindhost = NULL;
if ((n = resolve(ia, pf, bindhost, servname, AI_PASSIVE)) != 0)
@@ -72,7 +63,7 @@
}
static void
-@@ -371,10 +375,9 @@
+@@ -370,10 +374,9 @@
rtpp_log_write(RTPP_LOG_DBUG, cf->glog, "received command \"%s\"", buf);
@@ -84,7 +75,7 @@
if (**ap != '\0') {
argc++;
if (++ap >= &argv[10])
-@@ -651,7 +654,11 @@
+@@ -665,7 +668,11 @@
}
} else {
rtpp_log_write(RTPP_LOG_ERR, cf->glog, "getaddrinfo: %s",
@@ -96,7 +87,7 @@
}
}
}
-@@ -1222,7 +1229,7 @@
+@@ -1265,7 +1272,7 @@
if (cf->umode == 0) {
unlink(cmd_sock);
memset(&ifsun, '\0', sizeof ifsun);
@@ -105,7 +96,7 @@
ifsun.sun_len = strlen(cmd_sock);
#endif
ifsun.sun_family = AF_LOCAL;
-@@ -1537,7 +1544,7 @@
+@@ -1579,7 +1586,7 @@
controlfd = init_controlfd(&cf);
@@ -115,9 +106,9 @@
if (daemon(0, 0) == -1)
err(1, "can't switch into daemon mode");
Index: rtpproxy/rtpp_util.h
rtpproxy/rtpp_util.h.orig2007-07-28 10:17:02 +0200
-+++ rtpproxy/rtpp_util.h 2007-11-24 19:39:03 +0100
-@@ -84,7 +84,7 @@
+--- rtpproxy/rtpp_util.h.orig2007-12-19 03:17:03 +0100
rtpproxy/rtpp_util.h 2007-12-19 10:45:51 +0100
+@@ -90,7 +90,7 @@
#define DEFFILEMODE
(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.spec
$ cvs diff -u -r1.51 -r1.52 openser.spec
--- openpkg-src/openser/openser.spec 13 Dec 2007 16:50:14 - 1.51
+++ openpkg-src/openser/openser.spec 19 Dec 2007 09:55:31 - 1.52
@@ -24,7 +24,7 @@
# package options
%define V_openser 1.3.0
-%define V_rtpproxy 20071129-021701
+%define V_rtpproxy 20071219-021701
# package information
Name: openser
@@ -37,7 +37,7 @@
Group:VoIP
License: GPL
Version: %{V_openser}
-Release: 20071213
+Release: 20071219
# package options
%option with_fsl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Dec-2007 17:50:15
Branch: HEAD Handle: 2007121316501400
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
upgrading package: openser 1.2.2 -> 1.3.0
Summary:
RevisionChanges Path
1.11+6 -6 openpkg-src/openser/openser.patch
1.51+2 -2 openpkg-src/openser/openser.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
$ cvs diff -u -r1.10 -r1.11 openser.patch
--- openpkg-src/openser/openser.patch 24 Nov 2007 18:44:10 - 1.10
+++ openpkg-src/openser/openser.patch 13 Dec 2007 16:50:14 - 1.11
@@ -1,7 +1,7 @@
Index: Makefile.defs
Makefile.defs.orig 2007-08-16 16:23:20 +0200
-+++ Makefile.defs2007-11-24 19:39:03 +0100
-@@ -983,6 +983,8 @@
+--- Makefile.defs.orig 2007-12-13 14:39:06 +0100
Makefile.defs2007-12-13 17:37:18 +0100
+@@ -1018,6 +1018,8 @@
endif #mode=release
@@ -10,17 +10,17 @@
#*FLAGS used for compiling the modules
ifeq($(CC_NAME), gcc)
-@@ -1205,8 +1207,8 @@
+@@ -1254,8 +1256,8 @@
#add libssl if needed
ifneq ($(TLS),)
--DEFS+= -I$(LOCALBASE)/ssl/include
+-DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/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)
+ #add libsctp if needed
Index: modules/permissions/parse_config.c
--- modules/permissions/parse_config.c.orig 2007-08-16 16:22:57 +0200
+++ modules/permissions/parse_config.c 2007-11-24 19:39:03 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.spec
$ cvs diff -u -r1.50 -r1.51 openser.spec
--- openpkg-src/openser/openser.spec 29 Nov 2007 11:56:43 - 1.50
+++ openpkg-src/openser/openser.spec 13 Dec 2007 16:50:14 - 1.51
@@ -23,7 +23,7 @@
##
# package options
-%define V_openser 1.2.2
+%define V_openser 1.3.0
%define V_rtpproxy 20071129-021701
# package information
@@ -37,7 +37,7 @@
Group:VoIP
License: GPL
Version: %{V_openser}
-Release: 20071129
+Release: 20071213
# package options
%option with_fsl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
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: 24-Nov-2007 19:44:11
Branch: HEAD Handle: 2007112418441000
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
modifying package: openser-1.2.2 20071120 -> 20071124
Summary:
RevisionChanges Path
1.10+12 -12 openpkg-src/openser/openser.patch
1.49+2 -2 openpkg-src/openser/openser.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
$ cvs diff -u -r1.9 -r1.10 openser.patch
--- openpkg-src/openser/openser.patch 12 Nov 2007 07:48:38 - 1.9
+++ openpkg-src/openser/openser.patch 24 Nov 2007 18:44:10 - 1.10
@@ -1,6 +1,6 @@
Index: Makefile.defs
--- Makefile.defs.orig 2007-08-16 16:23:20 +0200
-+++ Makefile.defs2007-11-12 08:39:32 +0100
Makefile.defs2007-11-24 19:39:03 +0100
@@ -983,6 +983,8 @@
endif #mode=release
@@ -23,7 +23,7 @@
ifneq ($(found_lock_method), yes)
Index: modules/permissions/parse_config.c
--- modules/permissions/parse_config.c.orig 2007-08-16 16:22:57 +0200
-+++ modules/permissions/parse_config.c 2007-11-12 08:39:32 +0100
modules/permissions/parse_config.c 2007-11-24 19:39:03 +0100
@@ -114,8 +114,11 @@
except = strstr(str, " EXCEPT ");
if (except) {
@@ -49,8 +49,8 @@
}
Index: rtpproxy/main.c
rtpproxy/main.c.orig 2007-11-12 03:17:02 +0100
-+++ rtpproxy/main.c 2007-11-12 08:43:47 +0100
+--- rtpproxy/main.c.orig 2007-11-23 11:17:02 +0100
rtpproxy/main.c 2007-11-24 19:39:55 +0100
@@ -40,7 +40,7 @@
#include
#include
@@ -60,7 +60,7 @@
#include
#endif
#include
-@@ -139,7 +139,11 @@
+@@ -113,7 +113,11 @@
bindhost = NULL;
if ((n = resolve(ia, pf, bindhost, servname, AI_PASSIVE)) != 0)
@@ -72,9 +72,9 @@
}
static void
-@@ -399,10 +403,9 @@
+@@ -371,10 +375,9 @@
- rtpp_log_write(RTPP_LOG_DBUG, glog, "received command \"%s\"", buf);
+ rtpp_log_write(RTPP_LOG_DBUG, cf->glog, "received command \"%s\"", buf);
-cp = buf;
argc = 0;
@@ -84,10 +84,10 @@
if (**ap != '\0') {
argc++;
if (++ap >= &argv[10])
-@@ -660,7 +663,11 @@
+@@ -651,7 +654,11 @@
}
} else {
- rtpp_log_write(RTPP_LOG_ERR, glog, "getaddrinfo: %s",
+ rtpp_log_write(RTPP_LOG_ERR, cf->glog, "getaddrinfo: %s",
+#if defined(__sun__)
+ "unknown");
+#else
@@ -96,7 +96,7 @@
}
}
}
-@@ -1181,7 +1188,7 @@
+@@ -1222,7 +1229,7 @@
if (cf->umode == 0) {
unlink(cmd_sock);
memset(&ifsun, '\0', sizeof ifsun);
@@ -105,7 +105,7 @@
ifsun.sun_len = strlen(cmd_sock);
#endif
ifsun.sun_family = AF_LOCAL;
-@@ -1483,7 +1490,7 @@
+@@ -1537,7 +1544,7 @@
controlfd = init_controlfd(&cf);
@@ -116,7 +116,7 @@
err(1, "can't switch into daemon mode");
Index: rtpproxy/rtpp_util.h
--- rtpproxy/rtpp_util.h.orig2007-07-28 10:17:02 +0200
-+++ rtpproxy/rtpp_util.h 2007-11-12 08:39:32 +0100
rtpproxy/rtpp_util.h 2007-11-24 19:39:03 +0100
@@ -84,7 +84,7 @@
#define DEFFILEMODE
(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.spec
$ cvs diff -u -r1.48 -r1.49 openser.spec
--- openpkg-src/openser/openser.spec 20 Nov 2007 12:55:17 - 1.48
+++ openpkg-src/openser/openser.spec 24 Nov 2007 18:44:10 - 1.49
@@ -24,7 +24,7 @@
# package options
%define V_openser 1.2.2
-%define V_rtpproxy 20071120-021701
+%define V_rtpproxy 20071123-101701
# package information
Name: openser
@@ -37,7 +37,7 @@
Group:VoIP
License: GPL
Version: %{V_openser}
-Release: 20071120
+Release: 20071124
# package options
%option with_fsl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
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: 12-Nov-2007 08:48:41
Branch: HEAD Handle: 2007111207483800
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
modifying package: openser-1.2.2 20071110 -> 20071112
Summary:
RevisionChanges Path
1.9 +44 -49 openpkg-src/openser/openser.patch
1.43+2 -2 openpkg-src/openser/openser.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
$ cvs diff -u -r1.8 -r1.9 openser.patch
--- openpkg-src/openser/openser.patch 24 May 2007 07:13:31 - 1.8
+++ openpkg-src/openser/openser.patch 12 Nov 2007 07:48:38 - 1.9
@@ -1,6 +1,6 @@
Index: Makefile.defs
Makefile.defs.orig 2007-05-23 18:53:19 +0200
-+++ Makefile.defs2007-05-24 08:59:11 +0200
+--- Makefile.defs.orig 2007-08-16 16:23:20 +0200
Makefile.defs2007-11-12 08:39:32 +0100
@@ -983,6 +983,8 @@
endif #mode=release
@@ -21,10 +21,37 @@
endif
ifneq ($(found_lock_method), yes)
+Index: modules/permissions/parse_config.c
+--- modules/permissions/parse_config.c.orig 2007-08-16 16:22:57 +0200
modules/permissions/parse_config.c 2007-11-12 08:39:32 +0100
+@@ -114,8 +114,11 @@
+ except = strstr(str, " EXCEPT ");
+ if (except) {
+ /* exception found */
+-strncpy(str2, str, except-str);
+-str2[except-str] = '\0';
++int l = except - str;
++if (l > sizeof(str2) - 1)
++l = sizeof(str2) - 1;
++strncpy(str2, str, l);
++str2[l] = '\0';
+ /* except+8 points to the exception */
+ if (parse_expression_list(except+8, e_exceptions)) {
+ /* error */
+@@ -124,7 +127,8 @@
+ }
+ } else {
+ /* no exception */
+-strcpy(str2, str);
++strncpy(str2, str, sizeof(str2)-1);
++str2[sizeof(str2)-1] = '\0';
+ *e_exceptions = NULL;
+ }
+
Index: rtpproxy/main.c
rtpproxy/main.c.orig 2006-07-05 02:14:19 +0200
-+++ rtpproxy/main.c 2007-05-24 08:55:28 +0200
-@@ -38,7 +38,7 @@
+--- rtpproxy/main.c.orig 2007-11-12 03:17:02 +0100
rtpproxy/main.c 2007-11-12 08:43:47 +0100
+@@ -40,7 +40,7 @@
#include
#include
#include
@@ -33,7 +60,7 @@
#include
#endif
#include
-@@ -128,7 +128,11 @@
+@@ -139,7 +139,11 @@
bindhost = NULL;
if ((n = resolve(ia, pf, bindhost, servname, AI_PASSIVE)) != 0)
@@ -45,7 +72,7 @@
}
static void
-@@ -386,10 +390,9 @@
+@@ -399,10 +403,9 @@
rtpp_log_write(RTPP_LOG_DBUG, glog, "received command \"%s\"", buf);
@@ -57,7 +84,7 @@
if (**ap != '\0') {
argc++;
if (++ap >= &argv[10])
-@@ -642,7 +645,11 @@
+@@ -660,7 +663,11 @@
}
} else {
rtpp_log_write(RTPP_LOG_ERR, glog, "getaddrinfo: %s",
@@ -69,8 +96,8 @@
}
}
}
-@@ -1170,7 +1177,7 @@
- if (umode == 0) {
+@@ -1181,7 +1188,7 @@
+ if (cf->umode == 0) {
unlink(cmd_sock);
memset(&ifsun, '\0', sizeof ifsun);
-#if !defined(__linux__) && !defined(__solaris__)
@@ -78,19 +105,19 @@
ifsun.sun_len = strlen(cmd_sock);
#endif
ifsun.sun_family = AF_LOCAL;
-@@ -1203,7 +1210,7 @@
- flags = fcntl(controlfd, F_GETFL);
- fcntl(controlfd, F_SETFL, flags | O_NONBLOCK);
+@@ -1483,7 +1490,7 @@
+
+ controlfd = init_controlfd(&cf);
-#if !defined(__solaris__)
+#if !defined(__sun__)
- if (nodaemon == 0) {
+ if (cf.nodaemon == 0) {
if (daemon(0, 0) == -1)
err(1, "can't switch into daemon mode");
Index: rtpproxy/rtpp_util.h
rtpproxy/rtpp_util.h.orig2006-04-13 06:29:19 +0200
-+++ rtpproxy/rtpp_util.h 2007-05-24 08:55:28 +0200
-@@ -83,7 +83,7 @@
+--- rtpproxy/rtpp_util.h.orig2007-07-28 10:17:02 +0200
rtpproxy/rtpp_util.h 2007-11-12 08:39:32 +0100
+@@ -84,7 +84,7 @@
#define DEFFILEMODE
(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
#endif
@@ -99,35 +126,3 @@
#define err(exitcode, format, args...) \
errx(exitcode, format ": %s", ## args, strerror(errno))
#define errx(exitcode, format, args...) \
-
---
[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
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: 24-May-2007 09:13:31
Branch: HEAD Handle: 2007052408133100
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
upgrading package: openser 1.2.0 -> 1.2.1
Summary:
RevisionChanges Path
1.8 +12 -21 openpkg-src/openser/openser.patch
1.33+2 -2 openpkg-src/openser/openser.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
$ cvs diff -u -r1.7 -r1.8 openser.patch
--- openpkg-src/openser/openser.patch 13 Apr 2007 19:23:51 - 1.7
+++ openpkg-src/openser/openser.patch 24 May 2007 07:13:31 - 1.8
@@ -1,16 +1,7 @@
Index: Makefile.defs
Makefile.defs.orig 2007-03-12 17:39:09 +0100
-+++ Makefile.defs2007-03-13 08:10:29 +0100
-@@ -652,7 +652,7 @@
- ifeq($(CC_CLASS), 4.x)
- CPU_TYPE ?= ultrasparc
- #use 32bit for now
--CFLAGS+=-mcpu=ultrasparc
-minline-all-stringops \
-+CFLAGS+=-mcpu=ultrasparc \
- -mtune=$(CPU_TYPE) \
- -ftree-vectorize
- else
-@@ -974,6 +974,8 @@
+--- Makefile.defs.orig 2007-05-23 18:53:19 +0200
Makefile.defs2007-05-24 08:59:11 +0200
+@@ -983,6 +983,8 @@
endif #mode=release
@@ -19,7 +10,7 @@
#*FLAGS used for compiling the modules
ifeq($(CC_NAME), gcc)
-@@ -1196,8 +1198,8 @@
+@@ -1205,8 +1207,8 @@
#add libssl if needed
ifneq ($(TLS),)
@@ -32,7 +23,7 @@
ifneq ($(found_lock_method), yes)
Index: rtpproxy/main.c
--- rtpproxy/main.c.orig 2006-07-05 02:14:19 +0200
-+++ rtpproxy/main.c 2007-03-13 08:08:02 +0100
rtpproxy/main.c 2007-05-24 08:55:28 +0200
@@ -38,7 +38,7 @@
#include
#include
@@ -98,7 +89,7 @@
err(1, "can't switch into daemon mode");
Index: rtpproxy/rtpp_util.h
--- rtpproxy/rtpp_util.h.orig2006-04-13 06:29:19 +0200
-+++ rtpproxy/rtpp_util.h 2007-03-13 08:08:02 +0100
rtpproxy/rtpp_util.h 2007-05-24 08:55:28 +0200
@@ -83,7 +83,7 @@
#define DEFFILEMODE
(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
#endif
@@ -109,14 +100,14 @@
errx(exitcode, format ": %s", ## args, strerror(errno))
#define errx(exitcode, format, args...) \
--
+--
Security Fix (OpenPKG-SA-2006.042, OpenPKG-TT-E1#29)
Index: modules/permissions/parse_config.c
modules/permissions/parse_config.c.orig 2005-06-13 18:47:43 +0200
-+++ modules/permissions/parse_config.c 2006-12-26 11:15:25 +0100
-@@ -111,8 +111,11 @@
+--- modules/permissions/parse_config.c.orig 2007-03-12 16:22:54 +0100
modules/permissions/parse_config.c 2007-05-24 08:55:28 +0200
+@@ -114,8 +114,11 @@
except = strstr(str, " EXCEPT ");
if (except) {
/* exception found */
@@ -130,7 +121,7 @@
/* except+8 points to the exception */
if (parse_expression_list(except+8, e_exceptions)) {
/* error */
-@@ -121,7 +124,8 @@
+@@ -124,7 +127,8 @@
}
} else {
/* no exception */
@@ -139,4 +130,4 @@
+str2[sizeof(str2)-1] = '\0';
*e_exceptions = NULL;
}
-
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.spec
$ cvs diff -u -r1.32 -r1.33 openser.spec
--- openpkg-src/openser/openser.spec 13 Apr 2007 19:23:51 - 1.32
+++ openpkg-src/openser/openser.spec 24 May 2007 07:13:31 - 1.33
@@ -23,7 +23,7 @@
##
# package options
-%define V_openser 1.2.0
+%define V_openser 1.2.1
%define V_rtpproxy 20070222-181301
# package information
@@ -37,7 +37,7 @@
Group:VoIP
License: GPL
Version: %{V_openser}
-Release: 20070413
+Release: 20070524
# package options
%option with_fsl yes
@@ .
__
OpenPKG
[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
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: 13-Apr-2007 21:23:51
Branch: HEAD Handle: 2007041320235100
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
MFE:
Security Fix (OpenPKG-SA-2006.042, OpenPKG-TT-E1#29)
Summary:
RevisionChanges Path
1.7 +32 -0 openpkg-src/openser/openser.patch
1.32+1 -1 openpkg-src/openser/openser.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
$ cvs diff -u -r1.6 -r1.7 openser.patch
--- openpkg-src/openser/openser.patch 13 Mar 2007 07:16:28 - 1.6
+++ openpkg-src/openser/openser.patch 13 Apr 2007 19:23:51 - 1.7
@@ -108,3 +108,35 @@
#define err(exitcode, format, args...) \
errx(exitcode, format ": %s", ## args, strerror(errno))
#define errx(exitcode, format, args...) \
+
+-
+
+Security Fix (OpenPKG-SA-2006.042, OpenPKG-TT-E1#29)
+
+Index: modules/permissions/parse_config.c
+--- modules/permissions/parse_config.c.orig 2005-06-13 18:47:43 +0200
modules/permissions/parse_config.c 2006-12-26 11:15:25 +0100
+@@ -111,8 +111,11 @@
+ except = strstr(str, " EXCEPT ");
+ if (except) {
+ /* exception found */
+-strncpy(str2, str, except-str);
+-str2[except-str] = '\0';
++int l = except - str;
++if (l > sizeof(str2) - 1)
++l = sizeof(str2) - 1;
++strncpy(str2, str, l);
++str2[l] = '\0';
+ /* except+8 points to the exception */
+ if (parse_expression_list(except+8, e_exceptions)) {
+ /* error */
+@@ -121,7 +124,8 @@
+ }
+ } else {
+ /* no exception */
+-strcpy(str2, str);
++strncpy(str2, str, sizeof(str2)-1);
++str2[sizeof(str2)-1] = '\0';
+ *e_exceptions = NULL;
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.spec
$ cvs diff -u -r1.31 -r1.32 openser.spec
--- openpkg-src/openser/openser.spec 13 Mar 2007 07:16:28 - 1.31
+++ openpkg-src/openser/openser.spec 13 Apr 2007 19:23:51 - 1.32
@@ -37,7 +37,7 @@
Group:VoIP
License: GPL
Version: %{V_openser}
-Release: 20070313
+Release: 20070413
# package options
%option with_fsl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
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: 13-Mar-2007 08:16:28
Branch: HEAD Handle: 2007031307162800
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
upgrading package: openser 1.1.1 -> 1.2.0
Summary:
RevisionChanges Path
1.6 +10 -10 openpkg-src/openser/openser.patch
1.31+2 -2 openpkg-src/openser/openser.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
$ cvs diff -u -r1.5 -r1.6 openser.patch
--- openpkg-src/openser/openser.patch 22 Jan 2007 16:33:05 - 1.5
+++ openpkg-src/openser/openser.patch 13 Mar 2007 07:16:28 - 1.6
@@ -1,16 +1,16 @@
Index: Makefile.defs
Makefile.defs.orig 2007-01-22 13:16:11 +0100
-+++ Makefile.defs2007-01-22 17:28:29 +0100
-@@ -629,7 +629,7 @@
- ifeq($(CC_SHORTVER), 4.x)
- CPU ?= ultrasparc
+--- Makefile.defs.orig 2007-03-12 17:39:09 +0100
Makefile.defs2007-03-13 08:10:29 +0100
+@@ -652,7 +652,7 @@
+ ifeq($(CC_CLASS), 4.x)
+ CPU_TYPE ?= ultrasparc
#use 32bit for now
-CFLAGS+=-mcpu=ultrasparc
-minline-all-stringops \
+CFLAGS+=-mcpu=ultrasparc \
- -mtune=$(CPU) \
+ -mtune=$(CPU_TYPE) \
-ftree-vectorize
else
-@@ -989,6 +989,8 @@
+@@ -974,6 +974,8 @@
endif #mode=release
@@ -19,7 +19,7 @@
#*FLAGS used for compiling the modules
ifeq($(CC_NAME), gcc)
-@@ -1203,8 +1205,8 @@
+@@ -1196,8 +1198,8 @@
#add libssl if needed
ifneq ($(TLS),)
@@ -32,7 +32,7 @@
ifneq ($(found_lock_method), yes)
Index: rtpproxy/main.c
--- rtpproxy/main.c.orig 2006-07-05 02:14:19 +0200
-+++ rtpproxy/main.c 2007-01-22 17:28:29 +0100
rtpproxy/main.c 2007-03-13 08:08:02 +0100
@@ -38,7 +38,7 @@
#include
#include
@@ -98,7 +98,7 @@
err(1, "can't switch into daemon mode");
Index: rtpproxy/rtpp_util.h
--- rtpproxy/rtpp_util.h.orig2006-04-13 06:29:19 +0200
-+++ rtpproxy/rtpp_util.h 2007-01-22 17:28:29 +0100
rtpproxy/rtpp_util.h 2007-03-13 08:08:02 +0100
@@ -83,7 +83,7 @@
#define DEFFILEMODE
(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.spec
$ cvs diff -u -r1.30 -r1.31 openser.spec
--- openpkg-src/openser/openser.spec 23 Feb 2007 07:45:55 - 1.30
+++ openpkg-src/openser/openser.spec 13 Mar 2007 07:16:28 - 1.31
@@ -23,7 +23,7 @@
##
# package options
-%define V_openser 1.1.1
+%define V_openser 1.2.0
%define V_rtpproxy 20070222-181301
# package information
@@ -37,7 +37,7 @@
Group:VoIP
License: GPL
Version: %{V_openser}
-Release: 20070223
+Release: 20070313
# package options
%option with_fsl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
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: 22-Jan-2007 17:33:06
Branch: HEAD Handle: 2007012216330500
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
upgrading package: openser 1.1.0 -> 1.1.1
Summary:
RevisionChanges Path
1.5 +9 -21 openpkg-src/openser/openser.patch
1.29+2 -2 openpkg-src/openser/openser.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
$ cvs diff -u -r1.4 -r1.5 openser.patch
--- openpkg-src/openser/openser.patch 24 Oct 2006 12:50:43 - 1.4
+++ openpkg-src/openser/openser.patch 22 Jan 2007 16:33:05 - 1.5
@@ -1,7 +1,7 @@
Index: Makefile.defs
Makefile.defs.orig 2006-07-10 19:57:20.0 +0200
-+++ Makefile.defs2006-10-24 14:37:21.637521203 +0200
-@@ -628,7 +628,7 @@
+--- Makefile.defs.orig 2007-01-22 13:16:11 +0100
Makefile.defs2007-01-22 17:28:29 +0100
+@@ -629,7 +629,7 @@
ifeq($(CC_SHORTVER), 4.x)
CPU ?= ultrasparc
#use 32bit for now
@@ -10,7 +10,7 @@
-mtune=$(CPU) \
-ftree-vectorize
else
-@@ -987,6 +987,8 @@
+@@ -989,6 +989,8 @@
endif #mode=release
@@ -19,7 +19,7 @@
#*FLAGS used for compiling the modules
ifeq($(CC_NAME), gcc)
-@@ -1199,8 +1201,8 @@
+@@ -1203,8 +1205,8 @@
#add libssl if needed
ifneq ($(TLS),)
@@ -30,21 +30,9 @@
endif
ifneq ($(found_lock_method), yes)
-Index: cfg.y
cfg.y.orig 2006-07-10 15:37:02.0 +0200
-+++ cfg.y2006-10-24 14:36:05.572200941 +0200
-@@ -854,7 +854,7 @@
-
tos=IPTOS_THROUGHPUT;
- } else if
(strcasecmp($3,"IPTOS_RELIABILITY")) {
-
tos=IPTOS_RELIABILITY;
--#if !defined(__OS_solaris) || !defined(__OS_netbsd)
-+#if (!defined(__OS_solaris) || !defined(__OS_netbsd)) &&
defined(IPTOS_MINCOST)
- } else if
(strcasecmp($3,"IPTOS_MINCOST")) {
-
tos=IPTOS_MINCOST;
- #endif
Index: rtpproxy/main.c
rtpproxy/main.c.orig 2006-07-05 02:14:19.0 +0200
-+++ rtpproxy/main.c 2006-10-24 14:36:05.573430941 +0200
+--- rtpproxy/main.c.orig 2006-07-05 02:14:19 +0200
rtpproxy/main.c 2007-01-22 17:28:29 +0100
@@ -38,7 +38,7 @@
#include
#include
@@ -109,8 +97,8 @@
if (daemon(0, 0) == -1)
err(1, "can't switch into daemon mode");
Index: rtpproxy/rtpp_util.h
rtpproxy/rtpp_util.h.orig2006-04-13 06:29:19.0 +0200
-+++ rtpproxy/rtpp_util.h 2006-10-24 14:36:05.573806775 +0200
+--- rtpproxy/rtpp_util.h.orig2006-04-13 06:29:19 +0200
rtpproxy/rtpp_util.h 2007-01-22 17:28:29 +0100
@@ -83,7 +83,7 @@
#define DEFFILEMODE
(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.spec
$ cvs diff -u -r1.28 -r1.29 openser.spec
--- openpkg-src/openser/openser.spec 1 Jan 2007 17:40:26 - 1.28
+++ openpkg-src/openser/openser.spec 22 Jan 2007 16:33:05 - 1.29
@@ -23,7 +23,7 @@
##
# package options
-%define V_openser 1.1.0
+%define V_openser 1.1.1
%define V_rtpproxy 20061205-021301
# package information
@@ -37,7 +37,7 @@
Group:VoIP
License: GPL
Version: %{V_openser}
-Release: 20061205
+Release: 20070122
# package options
%option with_fsl yes
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
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: 24-Oct-2006 14:50:44
Branch: HEAD Handle: 2006102413504300
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
fix building under Sun Solaris
Summary:
RevisionChanges Path
1.4 +13 -4 openpkg-src/openser/openser.patch
1.26+3 -1 openpkg-src/openser/openser.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
$ cvs diff -u -r1.3 -r1.4 openser.patch
--- openpkg-src/openser/openser.patch 12 Oct 2006 17:42:00 - 1.3
+++ openpkg-src/openser/openser.patch 24 Oct 2006 12:50:43 - 1.4
@@ -1,6 +1,15 @@
Index: Makefile.defs
--- Makefile.defs.orig 2006-07-10 19:57:20.0 +0200
-+++ Makefile.defs2006-10-12 16:46:28.371048766 +0200
Makefile.defs2006-10-24 14:37:21.637521203 +0200
+@@ -628,7 +628,7 @@
+ ifeq($(CC_SHORTVER), 4.x)
+ CPU ?= ultrasparc
+ #use 32bit for now
+-CFLAGS+=-mcpu=ultrasparc
-minline-all-stringops \
++CFLAGS+=-mcpu=ultrasparc \
+ -mtune=$(CPU) \
+ -ftree-vectorize
+ else
@@ -987,6 +987,8 @@
endif #mode=release
@@ -23,7 +32,7 @@
ifneq ($(found_lock_method), yes)
Index: cfg.y
--- cfg.y.orig 2006-07-10 15:37:02.0 +0200
-+++ cfg.y2006-10-12 16:46:28.371878474 +0200
cfg.y2006-10-24 14:36:05.572200941 +0200
@@ -854,7 +854,7 @@
tos=IPTOS_THROUGHPUT;
} else if
(strcasecmp($3,"IPTOS_RELIABILITY")) {
@@ -35,7 +44,7 @@
#endif
Index: rtpproxy/main.c
--- rtpproxy/main.c.orig 2006-07-05 02:14:19.0 +0200
-+++ rtpproxy/main.c 2006-10-12 18:52:30.244787676 +0200
rtpproxy/main.c 2006-10-24 14:36:05.573430941 +0200
@@ -38,7 +38,7 @@
#include
#include
@@ -101,7 +110,7 @@
err(1, "can't switch into daemon mode");
Index: rtpproxy/rtpp_util.h
--- rtpproxy/rtpp_util.h.orig2006-04-13 06:29:19.0 +0200
-+++ rtpproxy/rtpp_util.h 2006-10-12 16:50:58.099769521 +0200
rtpproxy/rtpp_util.h 2006-10-24 14:36:05.573806775 +0200
@@ -83,7 +83,7 @@
#define DEFFILEMODE
(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.spec
$ cvs diff -u -r1.25 -r1.26 openser.spec
--- openpkg-src/openser/openser.spec 13 Oct 2006 17:30:59 - 1.25
+++ openpkg-src/openser/openser.spec 24 Oct 2006 12:50:43 - 1.26
@@ -37,7 +37,7 @@
Group:VoIP
License: GPL
Version: %{V_openser}
-Release: 20061013
+Release: 20061024
# package options
%option with_fsl yes
@@ -139,6 +139,7 @@
# install program
%{l_make} %{l_mflags} \
+INSTALL="%{l_shtool} install%{l_nil} -c" \
basedir=$RPM_BUILD_ROOT \
prefix=%{l_prefix} \
cfg-prefix=$RPM_BUILD_ROOT \
@@ -149,6 +150,7 @@
# install modules
%{l_make} %{l_mflags} \
+INSTALL="%{l_shtool} install%{l_nil} -c" \
basedir=$RPM_BUILD_ROOT \
prefix=%{l_prefix} \
cfg-prefix=$RPM_BUILD_ROOT \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
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: 12-Oct-2006 19:42:00
Branch: HEAD Handle: 200610121842
Modified files:
openpkg-src/openser openser.patch openser.spec
Log:
port to Solaris
Summary:
RevisionChanges Path
1.3 +92 -2 openpkg-src/openser/openser.patch
1.23+8 -4 openpkg-src/openser/openser.spec
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.patch
$ cvs diff -u -r1.2 -r1.3 openser.patch
--- openpkg-src/openser/openser.patch 16 Jul 2006 08:01:00 - 1.2
+++ openpkg-src/openser/openser.patch 12 Oct 2006 17:42:00 - 1.3
@@ -1,6 +1,6 @@
Index: Makefile.defs
Makefile.defs.orig 2006-07-10 19:57:20 +0200
-+++ Makefile.defs2006-07-16 09:54:39 +0200
+--- Makefile.defs.orig 2006-07-10 19:57:20.0 +0200
Makefile.defs2006-10-12 16:46:28.371048766 +0200
@@ -987,6 +987,8 @@
endif #mode=release
@@ -21,3 +21,93 @@
endif
ifneq ($(found_lock_method), yes)
+Index: cfg.y
+--- cfg.y.orig 2006-07-10 15:37:02.0 +0200
cfg.y2006-10-12 16:46:28.371878474 +0200
+@@ -854,7 +854,7 @@
+
tos=IPTOS_THROUGHPUT;
+ } else if
(strcasecmp($3,"IPTOS_RELIABILITY")) {
+
tos=IPTOS_RELIABILITY;
+-#if !defined(__OS_solaris) || !defined(__OS_netbsd)
++#if (!defined(__OS_solaris) || !defined(__OS_netbsd)) &&
defined(IPTOS_MINCOST)
+ } else if
(strcasecmp($3,"IPTOS_MINCOST")) {
+
tos=IPTOS_MINCOST;
+ #endif
+Index: rtpproxy/main.c
+--- rtpproxy/main.c.orig 2006-07-05 02:14:19.0 +0200
rtpproxy/main.c 2006-10-12 18:52:30.244787676 +0200
+@@ -38,7 +38,7 @@
+ #include
+ #include
+ #include
+-#if !defined(__solaris__)
++#if !defined(__sun__)
+ #include
+ #endif
+ #include
+@@ -128,7 +128,11 @@
+ bindhost = NULL;
+
+ if ((n = resolve(ia, pf, bindhost, servname, AI_PASSIVE)) != 0)
++#if defined(__sun__)
++errx(1, "setbindhost");
++#else
+ errx(1, "setbindhost: %s", gai_strerror(n));
++#endif
+ }
+
+ static void
+@@ -386,10 +390,9 @@
+
+ rtpp_log_write(RTPP_LOG_DBUG, glog, "received command \"%s\"", buf);
+
+-cp = buf;
+ argc = 0;
+ memset(argv, 0, sizeof(argv));
+-for (ap = argv; (*ap = strsep(&cp, "\r\n\t ")) != NULL;)
++for (ap = argv, cp = strtok(buf, "\r\n\t "); (cp = strtok(NULL, "\r\n\t
")) != NULL;)
+ if (**ap != '\0') {
+ argc++;
+ if (++ap >= &argv[10])
+@@ -642,7 +645,11 @@
+ }
+ } else {
+ rtpp_log_write(RTPP_LOG_ERR, glog, "getaddrinfo: %s",
++#if defined(__sun__)
++ "unknown");
++#else
+ gai_strerror(n));
++#endif
+ }
+ }
+ }
+@@ -1170,7 +1177,7 @@
+ if (umode == 0) {
+ unlink(cmd_sock);
+ memset(&ifsun, '\0', sizeof ifsun);
+-#if !defined(__linux__) && !defined(__solaris__)
++#if !defined(__linux__) && !defined(__sun__)
+ ifsun.sun_len = strlen(cmd_sock);
+ #endif
+ ifsun.sun_family = AF_LOCAL;
+@@ -1203,7 +1210,7 @@
+ flags = fcntl(controlfd, F_GETFL);
+ fcntl(controlfd, F_SETFL, flags | O_NONBLOCK);
+
+-#if !defined(__solaris__)
++#if !defined(__sun__)
+ if (nodaemon == 0) {
+ if (daemon(0, 0) == -1)
+ err(1, "can't switch into daemon mode");
+Index: rtpproxy/rtpp_util.h
+--- rtpproxy/rtpp_util.h.orig2006-04-13 06:29:19.0 +0200
rtpproxy/rtpp_util.h 2006-10-12 16:50:58.099769521 +0200
+@@ -83,7 +83,7 @@
+ #define DEFFILEMODE
(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
+ #endif
+
+-#if defined(__solaris__)
++#if defined(__sun__)
+ #define err(exitcode, format, args...) \
+ errx(exitcode, format ": %s", ## args, strerror(errno))
+ #define errx(exitcode, format, args...) \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openser/openser.spec
$ cvs diff -u -r1.22 -r1.23 openser.spec
--- openpkg-src/openser/openser.spec 23 Sep 2006 11:37:18 - 1.22
+++ openpkg-src/openser/openser.spec 1
[CVS] OpenPKG: openpkg-src/openser/ openser.patch openser.spec
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:
RevisionChanges 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 - 1.1
+++ openpkg-src/openser/openser.patch 16 Jul 2006 08:01:00 - 1.2
@@ -1,12 +1,23 @@
Index: Makefile.defs
Makefile.defs.orig 2005-07-01 14:13:43 +0200
-+++ Makefile.defs2005-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.defs2006-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 - 1.17
+++ openpkg-src/openser/openser.spec 16 Jul 2006 08:01:03 - 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 Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
