# HG changeset patch # User Michael Schloh von Bennewitz # Date 1348260046 -7200 # Node ID 2164082fa57f48ba5538619bbbfb951c3fc6f91f # Parent da76d565ccd373c1d2d55e7f2131701cc0ff4ca9 Import package vendor original spec for necessary manipulations. diff -r da76d565ccd3 -r 2164082fa57f sipcalc/sipcalc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sipcalc/sipcalc.patch Fri Sep 21 22:40:46 2012 +0200 @@ -0,0 +1,121 @@ +--- src/sub-func.c.orig 2003-03-19 13:28:15.000000000 +0100 ++++ src/sub-func.c 2003-07-28 10:35:53.000000000 +0200 +@@ -1267,7 +1267,7 @@ + } + #endif + +-#if defined(HAVE_GETHOSTBYNAME2) && defined(HAVE_INET_NTOP) ++#if defined(HAVE_GETHOSTBYNAME2) && defined(HAVE_INET_NTOP) && defined(AF_INET6) + char * + _resolv_v6_ghbn2 (char *raddr, struct dnsresp *d_resp, char *extra) + { +@@ -1308,7 +1308,7 @@ + } + #endif + +-#if defined(HAVE_GETADDRINFO) && defined(HAVE_INET_NTOP) ++#if defined(HAVE_GETADDRINFO) && defined(HAVE_INET_NTOP) && defined(AF_INET6) + char * + _resolv_v6_gai (char *raddr, struct dnsresp *d_resp, char *extra) + { +@@ -1393,13 +1393,19 @@ + snprintf(d_resp->str, 127, "%s%s", inet_ntoa (sin->sin_addr), extra); + d_resp->type = AF_INET; + } ++#ifdef AF_INET6 + if (res->ai_family == PF_INET6) { + sin6 = (struct sockaddr_in6 *) res->ai_addr; + snprintf (retaddr, 1023, "%s%s", inet_ntop (AF_INET6, &sin6->sin6_addr, ip6addr, 128), extra); + snprintf (d_resp->str, 127, "%s%s", inet_ntop (AF_INET6, &sin6->sin6_addr, ip6addr, 128), extra); + d_resp->type = AF_INET6; + } ++#endif ++#ifdef AF_INET6 + if (res->ai_next && (res->ai_family == PF_INET || res->ai_family == PF_INET6)) ++#else ++ if (res->ai_next && res->ai_family == PF_INET) ++#endif + d_resp = new_dnsresp (d_resp); + res = res->ai_next; + } +@@ -1460,14 +1466,20 @@ + if ((f_gethostbyname2 || f_getaddrinfo) && f_inet_ntop) + ipv6_cap = 1; + ++#ifdef AF_INET6 + if (family != PF_INET && family != PF_INET6 && family != PF_UNSPEC) ++#else ++ if (family != PF_INET && family != PF_UNSPEC) ++#endif + return NULL; + + if (family == PF_INET && !ipv4_cap) + return NULL; + ++#ifdef AF_INET6 + if (family == PF_INET6 && !ipv6_cap) + return NULL; ++#endif + + if (family == PF_UNSPEC && (!ipv4_cap && !ipv6_cap)) + return NULL; +@@ -1475,8 +1487,10 @@ + if (strlen (addr) > 1023) + return NULL; + ++#ifdef AF_INET6 + if (family == PF_UNSPEC && !ipv4_cap) + family = PF_INET6; ++#endif + + if (family == PF_UNSPEC && !ipv6_cap) + family = PF_INET; +@@ -1508,6 +1522,7 @@ + return retaddr; + } + ++#ifdef AF_INET6 + if (family == PF_INET6) { + if (f_getaddrinfo) { + tmpstr = _resolv_v6_gai (raddr, d_resp, extra); +@@ -1525,6 +1540,7 @@ + return retaddr; + } + } ++#endif + + if (family == PF_UNSPEC) { + if (f_getaddrinfo) { +--- src/sub.c.orig 2003-03-19 13:28:16.000000000 +0100 ++++ src/sub.c 2003-07-28 10:37:10.000000000 +0200 +@@ -496,6 +496,7 @@ + ifarg_cur->type = IFT_V6; + } + ++#if AF_INET6 + if (abox->type == AT_V6 && abox->resolv) { + d_resp_start = d_resp_cur = (struct dnsresp *) malloc (sizeof (struct dnsresp)); + d_resp_start->next = NULL; +@@ -526,6 +527,7 @@ + + free_dnsresp (d_resp_start); + } ++#endif + + if (abox->type == AT_INT) { + if_cur = if_start; +@@ -585,12 +587,14 @@ + d_resp_cur = d_resp_start; + while (d_resp_cur) { + strncpy (ifarg_cur->cmdstr, abox->str, 127); ++#if AF_INET6 + if (d_resp_cur->type == AF_INET6) { + strncpy (ifarg_cur->p_v6addr, d_resp_cur->str, 43); + ifarg_cur->type = IFT_V6; + + mk_ipv6addr (&ifarg_cur->v6ad, ifarg_cur->p_v6addr); + } ++#endif + if (d_resp_cur->type == AF_INET) { + tmpstr = strstr (d_resp_cur->str, " "); + if (tmpstr != NULL && (strlen (tmpstr) > 0)) { diff -r da76d565ccd3 -r 2164082fa57f sipcalc/sipcalc.spec --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sipcalc/sipcalc.spec Fri Sep 21 22:40:46 2012 +0200 @@ -0,0 +1,81 @@ +## +## sipcalc.spec -- OpenPKG RPM Package Specification +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. +## +## Permission to use, copy, modify, and distribute this software for +## any purpose with or without fee is hereby granted, provided that +## the above copyright notice and this permission notice appear in all +## copies. +## +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +## SUCH DAMAGE. +## + +# package information +Name: sipcalc +Summary: IP Subnet Calculator +URL: http://www.routemeister.net/projects/sipcalc/ +Vendor: Simon Ekstrand +Packager: OpenPKG Foundation e.V. +Distribution: OpenPKG Community +Class: PLUS +Group: Mapping +License: GPL +Version: 1.1.5 +Release: 20090721 + +# list of sources +Source0: http://www.routemeister.net/projects/sipcalc/files/sipcalc-%{version}.tar.gz +Patch0: sipcalc.patch + +# build information +Prefix: %{l_prefix} +BuildRoot: %{l_buildroot} +BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make +PreReq: OpenPKG, openpkg >= 20040130 +AutoReq: no +AutoReqProv: no + +%description + SipCalc is an IP subnet calculator. + +%track + prog sipcalc = { + version = %{version} + url = http://www.routemeister.net/projects/sipcalc/download.html + regex = sipcalc-(\d+\.\d+\.\d+)\.tar\.gz + } + +%prep + %setup -q + %patch -p0 + +%build + CC="%{l_cc}" \ + CFLAGS="%{l_cflags -O}" \ + GREP="grep" \ + ./configure \ + --prefix=%{l_prefix} + %{l_make} %{l_mflags -O} + +%install + rm -rf $RPM_BUILD_ROOT + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} + +%files -f files + +%clean + rm -rf $RPM_BUILD_ROOT +