aboutsummaryrefslogtreecommitdiffstats
path: root/main/sems
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-05-27 15:27:40 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-05-27 15:27:40 +0000
commite3206064c6394c0e776d404750b45fff599aa5f7 (patch)
treed12d6deeaf771b9e75b52d9cfe6e9b4ddebd62f5 /main/sems
parent0b0282148bceda37177bff0581fc14eab733f925 (diff)
downloadaports-e3206064c6394c0e776d404750b45fff599aa5f7.tar.bz2
aports-e3206064c6394c0e776d404750b45fff599aa5f7.tar.xz
main/sems: upgrade to 1.4.1
Diffstat (limited to 'main/sems')
-rw-r--r--main/sems/APKBUILD8
-rw-r--r--main/sems/sems-0011-Avoid-using-private-Glibc-functions.patch67
2 files changed, 3 insertions, 72 deletions
diff --git a/main/sems/APKBUILD b/main/sems/APKBUILD
index 80a387e028..6d01389704 100644
--- a/main/sems/APKBUILD
+++ b/main/sems/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Francesco Colista <francesco.colista@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sems
-pkgver=1.4.0
-pkgrel=1
+pkgver=1.4.1
+pkgrel=0
pkgdesc="SIP Express Media Server, an extensible SIP media server"
url="http://iptel.org/sems/"
arch="all"
@@ -22,7 +22,6 @@ source="http://ftp.iptel.org/pub/sems/sems-$pkgver.tar.gz
sems-0001-Force-to-use-system-wide-GSM-includes.patch
sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
- sems-0011-Avoid-using-private-Glibc-functions.patch
sems.initd
"
@@ -196,9 +195,8 @@ xmlrpc2di() {
}
-md5sums="ebd5d646f71c8f62c7da51d1f4b89b9d sems-1.4.0.tar.gz
+md5sums="686ab348e06d8cac7c52080c8b056487 sems-1.4.1.tar.gz
5b2fded836b44bda33f39adc37de4de7 sems-0001-Force-to-use-system-wide-GSM-includes.patch
b8efd1a6415afa08f7c676f6976fca36 sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
331e7529833c906b4738006f32a65fde sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
-bf4070f110489ef21540b009347fcd81 sems-0011-Avoid-using-private-Glibc-functions.patch
36c2f993ba874781f5d3974b4f4c1503 sems.initd"
diff --git a/main/sems/sems-0011-Avoid-using-private-Glibc-functions.patch b/main/sems/sems-0011-Avoid-using-private-Glibc-functions.patch
deleted file mode 100644
index 048a0a9ba4..0000000000
--- a/main/sems/sems-0011-Avoid-using-private-Glibc-functions.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From fb437ef493d6023e936bd55088df7e6d99452cfb Mon Sep 17 00:00:00 2001
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Tue, 4 Jan 2011 22:34:03 +0300
-Subject: [PATCH 11/11] Avoid using private Glibc functions
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
----
- core/sip/resolver.cpp | 33 +++++++++++++++++++++++++++------
- 1 files changed, 27 insertions(+), 6 deletions(-)
-
-diff --git a/core/sip/resolver.cpp b/core/sip/resolver.cpp
-index e3443c7..3b3e4a6 100644
---- a/core/sip/resolver.cpp
-+++ b/core/sip/resolver.cpp
-@@ -54,6 +54,27 @@ using std::list;
- // (the limit is the # bits in dns_handle::srv_used)
- #define MAX_SRV_RR (sizeof(unsigned int)*8)
-
-+/* The SEMS_GET16 macro and the sems_get16 function were copied from glibc 2.7
-+ * (include/arpa/nameser.h (NS_GET16) and resolv/ns_netint.c (ns_get16)) to
-+ * avoid using private glibc functions.
-+ */
-+
-+# define SEMS_GET16(s, cp) \
-+ do { \
-+ uint16_t *t_cp = (uint16_t *) (cp); \
-+ (s) = ntohs (*t_cp); \
-+ (cp) += NS_INT16SZ; \
-+} while (0)
-+
-+u_int
-+sems_get16(const u_char *src)
-+{
-+ u_int dst;
-+
-+ SEMS_GET16(dst, src);
-+ return (dst);
-+}
-+
- struct ip_entry
- : public dns_base_entry
- {
-@@ -399,15 +420,15 @@ dns_base_entry* dns_srv_entry::get_rr(dns_record* rr, u_char* begin, u_char* end
- DBG("SRV:\tTTL=%i\t%s\tP=<%i> W=<%i> P=<%i> T=<%s>\n",
- ns_rr_ttl(*rr),
- ns_rr_name(*rr),
-- ns_get16(rdata),
-- ns_get16(rdata+2),
-- ns_get16(rdata+4),
-+ sems_get16(rdata),
-+ sems_get16(rdata+2),
-+ sems_get16(rdata+4),
- name_buf);
-
- srv_entry* srv_r = new srv_entry();
-- srv_r->p = ns_get16(rdata);
-- srv_r->w = ns_get16(rdata+2);
-- srv_r->port = ns_get16(rdata+4);
-+ srv_r->p = sems_get16(rdata);
-+ srv_r->w = sems_get16(rdata+2);
-+ srv_r->port = sems_get16(rdata+4);
- srv_r->target = (const char*)name_buf;
-
- return srv_r;
---
-1.7.3.4
-