[packages/isdn4k-utils] - up to 3.27 - add build fixes from debian
baggins
baggins at pld-linux.org
Mon Feb 27 20:40:10 CET 2017
commit d54245e7748f847c857b7b0d57ee47c26741bb16
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Feb 27 20:39:40 2017 +0100
- up to 3.27
- add build fixes from debian
format-security.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
gnu89-inline.patch | 17 +++++++++++++++++
isdn4k-utils.spec | 18 +++++++++++++-----
tcl8.6.patch | 21 +++++++++++++++++++++
use-va_copy.patch | 34 ++++++++++++++++++++++++++++++++++
5 files changed, 136 insertions(+), 5 deletions(-)
---
diff --git a/isdn4k-utils.spec b/isdn4k-utils.spec
index ae61e44..0944c60 100644
--- a/isdn4k-utils.spec
+++ b/isdn4k-utils.spec
@@ -2,7 +2,7 @@ Summary: Utilities for the kernel ISDN-subsystem
Summary(pl.UTF-8): Narzędzia dla podsystemu ISDN jądra
Summary(pt_BR.UTF-8): Utilitários para configuração do subsistema ISDN
Name: isdn4k-utils
-Version: 3.25
+Version: 3.27
Release: 1
Epoch: 3
License: GPL v2
@@ -10,7 +10,7 @@ Group: Applications/Communications
# git clone git://git.misdn.eu/isdn4k-utils.git
# git checkout v3.25
Source0: %{name}-%{version}.tar.xz
-# Source0-md5: cb297fd819a146f4c7afc6bc9706ac51
+# Source0-md5: 09d3d6fbb3e1f69776e7a9ada836e074
Source1: %{name}.config
Source2: capi.conf
Source3: capi.init
@@ -21,6 +21,10 @@ Patch3: %{name}-sh.patch
Patch4: %{name}-opt.patch
Patch5: %{name}-link.patch
Patch6: %{name}-rcapid.patch
+Patch7: use-va_copy.patch
+Patch8: format-security.patch
+Patch9: tcl8.6.patch
+Patch10: gnu89-inline.patch
URL: http://www.isdn4linux.de/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -230,6 +234,10 @@ Wtyczka CAPI dla pppd w wersji %{ppp_ver}.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
# don't symlink app-defaults dir to /etc/X11
%{__sed} -i -e 's, at xmkmf,imake -I%{_libdir}/X11/config -DUseInstalled -DUseSeparateConfDir=NO,' xisdnload/Makefile.in
@@ -251,7 +259,7 @@ for i in capifax capiinfo capiinit rcapid vbox; do
done
cp %{SOURCE1} .config
-%{__make} subconfig \
+%{__make} -j1 subconfig \
CC="%{__cc}" \
CFLAGS="%{rpmcflags} -I/usr/include/ncurses" \
CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses" \
@@ -259,7 +267,7 @@ cp %{SOURCE1} .config
OPTIM="%{rpmcflags}"
# explicit CC/CCFLAGS for imontty and few other dirs
-%{__make} \
+%{__make} -j1 \
CC="%{__cc}" \
CCFLAGS="%{rpmcflags}" \
PPPVERSION=%{ppp_ver} \
@@ -269,7 +277,7 @@ cp %{SOURCE1} .config
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/var/lock/isdn,/sbin}
-%{__make} install \
+%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT \
CONFIG_LIBDIR=%{_libdir} \
INCROOT=%{_includedir} \
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..890abc5
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,51 @@
+Author: Andreas Beckmann <anbe at debian.org>
+Description: fix problems found by -Werror=format-security
+
+--- a/isdnlog/isdnlog/asn1_address.c
++++ b/isdnlog/isdnlog/asn1_address.c
+@@ -160,7 +160,7 @@ int ParseAddress(struct Aoc *chanp, u_ch
+ XSEQUENCE_1(ParsePartyNumber, ASN1_NOT_TAGGED, ASN1_NOT_TAGGED, partyNumber);
+ XSEQUENCE_OPT_1(ParsePartySubaddress, ASN1_NOT_TAGGED, ASN1_NOT_TAGGED, partySubaddress);
+
+- str += sprintf(str, partyNumber);
++ str += sprintf(str, "%s", partyNumber);
+ if (strlen(partySubaddress))
+ str += sprintf(str, ".%s", partySubaddress);
+
+@@ -191,13 +191,13 @@ int ParsePublicPartyNumber(struct Aoc *c
+
+ switch (publicTypeOfNumber) {
+ case 0: break; // unknown
+- case 1: str += sprintf(str, countryprefix); break;
+- case 2: str += sprintf(str, areaprefix); break;
++ case 1: str += sprintf(str, "%s", countryprefix); break;
++ case 2: str += sprintf(str, "%s", areaprefix); break;
+ case 3: str += sprintf(str, "(network)"); break;
+ case 4: str += sprintf(str, "(MSN)"); break;
+ case 6: str += sprintf(str, "(abbrev)"); break;
+ }
+- str += sprintf(str, numberDigits);
++ str += sprintf(str, "%s", numberDigits);
+
+ return p - beg;
+ }
+@@ -219,7 +219,7 @@ int ParsePrivatePartyNumber(struct Aoc *
+ case 4: str += sprintf(str, "(local)"); break;
+ case 6: str += sprintf(str, "(abbrev)"); break;
+ }
+- str += sprintf(str, numberDigits);
++ str += sprintf(str, "%s", numberDigits);
+
+ return p - beg;
+ }
+--- a/isdnlog/isdnrep/isdnbill.c
++++ b/isdnlog/isdnrep/isdnbill.c
+@@ -271,7 +271,7 @@ static void strich(char c, int len)
+ memset(s, c, len);
+ s[len] = 0;
+
+- printf(s);
++ printf("%s", s);
+ printf("\n");
+ } /* strich */
+
diff --git a/gnu89-inline.patch b/gnu89-inline.patch
new file mode 100644
index 0000000..884562b
--- /dev/null
+++ b/gnu89-inline.patch
@@ -0,0 +1,17 @@
+Description: fix build failure with GCC5:
+ build isdnlog with -fgnu89-inline
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777920
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2015-07-20
+
+--- a/isdnlog/Makefile.in
++++ b/isdnlog/Makefile.in
+@@ -1720,6 +1720,7 @@ endif
+ # export CFLAGS = -Wall -pipe -O6 -fomit-frame-pointer -fforce-mem -fforce-addr -funroll-loops -fstrength-reduce
+
+ export CFLAGS = @CFLAGS@ -Wall -pipe
++CFLAGS += -fgnu89-inline
+ CC = @CC@
+
+ INCLUDE = -I./isdnlog -I./connect -I./tools -I$(PREFIXDIR) -I$(LIBISDNDIR)
diff --git a/tcl8.6.patch b/tcl8.6.patch
new file mode 100644
index 0000000..a0a423a
--- /dev/null
+++ b/tcl8.6.patch
@@ -0,0 +1,21 @@
+--- a/vbox/src/script.c
++++ b/vbox/src/script.c
+@@ -19,6 +19,8 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#define USE_INTERP_RESULT
++#define USE_INTERP_ERRORLINE
+ #include <tcl.h>
+ #include <unistd.h>
+ #include <string.h>
+--- a/vbox3/vboxgetty/tclscript.c
++++ b/vbox3/vboxgetty/tclscript.c
+@@ -8,6 +8,7 @@
+ # include "../config.h"
+ #endif
+
++#define USE_INTERP_ERRORLINE
+ #include <tcl.h>
+ #include <string.h>
+ #include <unistd.h>
diff --git a/use-va_copy.patch b/use-va_copy.patch
new file mode 100644
index 0000000..9a88439
--- /dev/null
+++ b/use-va_copy.patch
@@ -0,0 +1,34 @@
+Author: Andreas Beckmann <anbe at debian.org>
+Description: fix FTBFS: error: assignment to expression with array type
+
+--- a/ipppd/main.c
++++ b/ipppd/main.c
+@@ -1205,7 +1205,6 @@ int vfmtmsg(char *buf,int buflen,char *f
+ unsigned long val=0;
+ char *str, *f, *buf0;
+ unsigned char *p;
+- va_list a;
+ char num[32];
+ time_t t;
+ static char hexchars[] = "0123456789abcdef";
+@@ -1296,15 +1295,19 @@ int vfmtmsg(char *buf,int buflen,char *f
+ str = ip_ntoa(va_arg(args, u_int32_t));
+ break;
+ case 'r':
++ {
++ va_list a;
+ f = va_arg(args, char *);
+- a = va_arg(args, va_list);
++ va_copy(a, args);
+ #ifdef __alpha__ /* always do this? */
+ n = fmtmsg(buf, buflen + 1, f, a);
+ #else
+ n = vfmtmsg(buf, buflen + 1, f, a);
+ #endif
++ va_end(a);
+ buf += n;
+ buflen -= n;
++ }
+ continue;
+ case 't':
+ time(&t);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/isdn4k-utils.git/commitdiff/d54245e7748f847c857b7b0d57ee47c26741bb16
More information about the pld-cvs-commit
mailing list