Hello community,
here is the log from the commit of package i4l-base for openSUSE:Factory
checked in at 2019-10-24 23:03:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/i4l-base (Old)
and /work/SRC/openSUSE:Factory/.i4l-base.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "i4l-base"
Thu Oct 24 23:03:20 2019 rev:73 rq:742089 version:2011.8.29
Changes:
--------
--- /work/SRC/openSUSE:Factory/i4l-base/i4l-base.changes 2019-09-11
10:36:57.763268885 +0200
+++ /work/SRC/openSUSE:Factory/.i4l-base.new.2990/i4l-base.changes
2019-10-24 23:03:24.576119325 +0200
@@ -1,0 +2,10 @@
+Tue Oct 22 08:24:33 UTC 2019 - o...@aepfle.de
+
+- Replace systemd-mini with pkgconfig(systemd)
+- Provide a copy of linux/isdn.h as linux.isdn.h.txt
+- Provide a copy of linux/isdnif.h as linux.isdnif.h.txt
+- Provide a copy of linux/isdn_ppp.h as linux.isdn_ppp.h.txt
+- Use RPM_OPT_FLAGS also in isdnlog.exe
+- Mention also isdn4k-utils-CFLAGS.patch because it fixes the build
+
+-------------------------------------------------------------------
New:
----
isdn4k-utils-CFLAGS.patch
linux.isdn.h.txt
linux.isdn_ppp.h.txt
linux.isdnif.h.txt
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ i4l-base.spec ++++++
--- /var/tmp/diff_new_pack.aO70U9/_old 2019-10-24 23:03:28.256123620 +0200
+++ /var/tmp/diff_new_pack.aO70U9/_new 2019-10-24 23:03:28.256123620 +0200
@@ -38,8 +38,7 @@
BuildRequires: openssl-devel
BuildRequires: ppp-devel
BuildRequires: sgmltool
-#!BuildIgnore: systemd
-BuildRequires: systemd-mini
+BuildRequires: pkgconfig(systemd)
BuildRequires: tcl-devel
BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
@@ -62,10 +61,14 @@
Source8: i4l-base-postprocess
Source9: i4l-base-sysconfig
Source10: libcapi20-3.0.7.tar.bz2
+Source11: linux.isdn.h.txt
+Source12: linux.isdnif.h.txt
+Source13: linux.isdn_ppp.h.txt
Source99: i4l-base-rpmlintrc
Patch: isdn4k-utils.dif
Patch1: capi20_3.0.7.patch
Patch2: isdn4k-utils-gcc5-fixes.patch
+Patch3: isdn4k-utils-CFLAGS.patch
Patch31: divactrl_2.1-gcc.diff
Patch32: divactrl_2.1-fix.diff
Patch33: divactrl_2.1-dprintf.diff
@@ -227,6 +230,7 @@
%patch35 -p1
%patch1 -p0
%patch2 -p2
+%patch3 -p1
chmod a+x */configure
mv -f eicon/firmware/eicon_firm.tgz eicon/firmware/firmware.tgz
mv -f eicon/firmware ../divactrl_2.1/
@@ -237,14 +241,22 @@
%patch36
%patch39 -p1
popd
-pushd ../isdn4k-utils
%patch37 -p1
%patch38 -p1
-popd
%patch50 -p1
%patch51 -p1
%build
+if test -f /usr/include/linux/isdn.h
+then
+ : noch mal von der Schippe gesprungen ...
+else
+ mkdir -p .purgatory/linux
+ ln -sv %{S:11} .purgatory/linux/isdn.h
+ ln -sv %{S:12} .purgatory/linux/isdnif.h
+ ln -sv %{S:13} .purgatory/linux/isdn_ppp.h
+ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -I$PWD/.purgatory"
+fi
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
# This package failed when testing with -Wl,-as-needed being default.
# So we disable it here, if you want to retest, just delete this comment and
the line below.
@@ -286,6 +298,7 @@
make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fgnu89-inline"
%install
+test -d .purgatory/linux && export RPM_OPT_FLAGS="$RPM_OPT_FLAGS
-I$PWD/.purgatory"
mkdir -p $RPM_BUILD_ROOT/usr/{sbin,bin,share,include}
mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8
mkdir -p $RPM_BUILD_ROOT/sbin
@@ -310,6 +323,7 @@
esac
done
make DESTDIR=$RPM_BUILD_ROOT install INSTALL_PROGRAM='install -m 0755' \
+ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fgnu89-inline" \
INSTALL_DATA='install -m 0644' INSTALL_MAN='install -m 0644' \
INSTALL_DIR='install -m 0755 -d' INSTALL_SBIN='install -m 0755' \
INSTALL_BIN='install -m 0755'
++++++ isdn4k-utils-CFLAGS.patch ++++++
--- a/isdnlog/Makefile.in
+++ b/isdnlog/Makefile.in
@@ -2185,22 +2185,22 @@ distrib: distclean
# uuencode /tmp/isdnlog-$(I4LVERSION).tar.gz
isdnlog-$(I4LVERSION).tar.gz > /tmp/isdnlog-$(I4LVERSION).uue
$(ISDNLOG): $(ISDNLOG_OBJS)
- $(CC) -o $(ISDNLOG) $(LFLAGS) $(ISDNLOG_OBJS) $(ORALIBS) $(LIB)
+ $(CC) -o $(ISDNLOG) $(CFLAGS) $(ISDNLOG_OBJS) $(ORALIBS) $(LIB)
$(ISDNREP): $(ISDNREP_OBJS)
- $(CC) -o $(ISDNREP) $(LFLAGS) $(ISDNREP_OBJS) $(LIB)
+ $(CC) -o $(ISDNREP) $(CFLAGS) $(ISDNREP_OBJS) $(LIB)
$(ISDNBILL): $(ISDNBILL_OBJS)
- $(CC) -o $(ISDNBILL) $(LFLAGS) $(ISDNBILL_OBJS) $(LIB)
+ $(CC) -o $(ISDNBILL) $(CFLAGS) $(ISDNBILL_OBJS) $(LIB)
$(ISDNCONF): $(ISDNCONF_OBJS)
- $(CC) -o $(ISDNCONF) $(LFLAGS) $(ISDNCONF_OBJS) $(LIB)
+ $(CC) -o $(ISDNCONF) $(CFLAGS) $(ISDNCONF_OBJS) $(LIB)
$(ISDNRATE): $(ISDNRATE_OBJS)
- $(CC) -o $(ISDNRATE) $(LFLAGS) $(ISDNRATE_OBJS) $(LIB)
+ $(CC) -o $(ISDNRATE) $(CFLAGS) $(ISDNRATE_OBJS) $(LIB)
$(ORA_LOAD): $(ORA_LOAD_OBJS)
- $(CC) -o $(ORA_LOAD) $(LFLAGS) $(ORA_LOAD_OBJS) $(ORALIBS)
+ $(CC) -o $(ORA_LOAD) $(CFLAGS) $(ORA_LOAD_OBJS) $(ORALIBS)
isdnlog/oracle.o: isdnlog/oracle.pc
$(PC) $(PCFLAGS) include=isdnlog code=ansi_c lname=isdnlog/_kgw.lis \
++++++ linux.isdn.h.txt ++++++
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
/* $Id: isdn.h,v 1.125.2.3 2004/02/10 01:07:14 keil Exp $
*
* Main header for the Linux ISDN subsystem (linklevel).
*
* Copyright 1994,95,96 by Fritz Elfert (fr...@isdn4linux.de)
* Copyright 1995,96 by Thinking Objects Software GmbH Wuerzburg
* Copyright 1995,96 by Michael Hipp (michael.h...@student.uni-tuebingen.de)
*
* This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference.
*
*/
#ifndef __ISDN_H__
#define __ISDN_H__
#include <linux/ioctl.h>
#include <linux/tty.h>
#define ISDN_MAX_DRIVERS 32
#define ISDN_MAX_CHANNELS 64
/* New ioctl-codes */
#define IIOCNETAIF _IO('I',1)
#define IIOCNETDIF _IO('I',2)
#define IIOCNETSCF _IO('I',3)
#define IIOCNETGCF _IO('I',4)
#define IIOCNETANM _IO('I',5)
#define IIOCNETDNM _IO('I',6)
#define IIOCNETGNM _IO('I',7)
#define IIOCGETSET _IO('I',8) /* no longer supported */
#define IIOCSETSET _IO('I',9) /* no longer supported */
#define IIOCSETVER _IO('I',10)
#define IIOCNETHUP _IO('I',11)
#define IIOCSETGST _IO('I',12)
#define IIOCSETBRJ _IO('I',13)
#define IIOCSIGPRF _IO('I',14)
#define IIOCGETPRF _IO('I',15)
#define IIOCSETPRF _IO('I',16)
#define IIOCGETMAP _IO('I',17)
#define IIOCSETMAP _IO('I',18)
#define IIOCNETASL _IO('I',19)
#define IIOCNETDIL _IO('I',20)
#define IIOCGETCPS _IO('I',21)
#define IIOCGETDVR _IO('I',22)
#define IIOCNETLCR _IO('I',23) /* dwabc ioctl for LCR from isdnlog */
#define IIOCNETDWRSET _IO('I',24) /* dwabc ioctl to reset abc-values to
default on a net-interface */
#define IIOCNETALN _IO('I',32)
#define IIOCNETDLN _IO('I',33)
#define IIOCNETGPN _IO('I',34)
#define IIOCDBGVAR _IO('I',127)
#define IIOCDRVCTL _IO('I',128)
/* cisco hdlck device private ioctls */
#define SIOCGKEEPPERIOD (SIOCDEVPRIVATE + 0)
#define SIOCSKEEPPERIOD (SIOCDEVPRIVATE + 1)
#define SIOCGDEBSERINT (SIOCDEVPRIVATE + 2)
#define SIOCSDEBSERINT (SIOCDEVPRIVATE + 3)
/* Packet encapsulations for net-interfaces */
#define ISDN_NET_ENCAP_ETHER 0
#define ISDN_NET_ENCAP_RAWIP 1
#define ISDN_NET_ENCAP_IPTYP 2
#define ISDN_NET_ENCAP_CISCOHDLC 3 /* Without SLARP and keepalive */
#define ISDN_NET_ENCAP_SYNCPPP 4
#define ISDN_NET_ENCAP_UIHDLC 5
#define ISDN_NET_ENCAP_CISCOHDLCK 6 /* With SLARP and keepalive */
#define ISDN_NET_ENCAP_X25IFACE 7 /* Documentation/networking/x25-iface.txt */
#define ISDN_NET_ENCAP_MAX_ENCAP ISDN_NET_ENCAP_X25IFACE
/* Facility which currently uses an ISDN-channel */
#define ISDN_USAGE_NONE 0
#define ISDN_USAGE_RAW 1
#define ISDN_USAGE_MODEM 2
#define ISDN_USAGE_NET 3
#define ISDN_USAGE_VOICE 4
#define ISDN_USAGE_FAX 5
#define ISDN_USAGE_MASK 7 /* Mask to get plain usage */
#define ISDN_USAGE_DISABLED 32 /* This bit is set, if channel is disabled */
#define ISDN_USAGE_EXCLUSIVE 64 /* This bit is set, if channel is exclusive */
#define ISDN_USAGE_OUTGOING 128 /* This bit is set, if channel is outgoing */
#define ISDN_MODEM_NUMREG 24 /* Number of Modem-Registers */
#define ISDN_LMSNLEN 255 /* Length of tty's Listen-MSN string */
#define ISDN_CMSGLEN 50 /* Length of CONNECT-Message to add for Modem
*/
#define ISDN_MSNLEN 32
#define NET_DV 0x06 /* Data version for isdn_net_ioctl_cfg */
#define TTY_DV 0x06 /* Data version for iprofd etc. */
#define INF_DV 0x01 /* Data version for /dev/isdninfo */
typedef struct {
char drvid[25];
unsigned long arg;
} isdn_ioctl_struct;
typedef struct {
char name[10];
char phone[ISDN_MSNLEN];
int outgoing;
} isdn_net_ioctl_phone;
typedef struct {
char name[10]; /* Name of interface */
char master[10]; /* Name of Master for Bundling */
char slave[10]; /* Name of Slave for Bundling */
char eaz[256]; /* EAZ/MSN */
char drvid[25]; /* DriverId for Bindings */
int onhtime; /* Hangup-Timeout */
int charge; /* Charge-Units */
int l2_proto; /* Layer-2 protocol */
int l3_proto; /* Layer-3 protocol */
int p_encap; /* Encapsulation */
int exclusive; /* Channel, if bound exclusive */
int dialmax; /* Dial Retry-Counter */
int slavedelay; /* Delay until slave starts up */
int cbdelay; /* Delay before Callback */
int chargehup; /* Flag: Charge-Hangup */
int ihup; /* Flag: Hangup-Timeout on incoming line */
int secure; /* Flag: Secure */
int callback; /* Flag: Callback */
int cbhup; /* Flag: Reject Call before Callback */
int pppbind; /* ippp device for bindings */
int chargeint; /* Use fixed charge interval length */
int triggercps; /* BogoCPS needed for triggering slave */
int dialtimeout; /* Dial-Timeout */
int dialwait; /* Time to wait after failed dial */
int dialmode; /* Flag: off / on / auto */
} isdn_net_ioctl_cfg;
#define ISDN_NET_DIALMODE_MASK 0xC0 /* bits for status */
#define ISDN_NET_DM_OFF 0x00 /* this interface is stopped */
#define ISDN_NET_DM_MANUAL 0x40 /* this interface is on (manual) */
#define ISDN_NET_DM_AUTO 0x80 /* this interface is autodial */
#define ISDN_NET_DIALMODE(x) ((&(x))->flags & ISDN_NET_DIALMODE_MASK)
#endif /* __ISDN_H__ */
++++++ linux.isdn_ppp.h.txt ++++++
/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
/* Linux ISDN subsystem, sync PPP, interface to ipppd
*
* Copyright 1994-1999 by Fritz Elfert (fr...@isdn4linux.de)
* Copyright 1995,96 Thinking Objects Software GmbH Wuerzburg
* Copyright 1995,96 by Michael Hipp (michael.h...@student.uni-tuebingen.de)
* Copyright 2000-2002 by Kai Germaschewski (k...@germaschewski.name)
*
* This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference.
*
*/
#ifndef _LINUX_ISDN_PPP_H
#define _LINUX_ISDN_PPP_H
#define CALLTYPE_INCOMING 0x1
#define CALLTYPE_OUTGOING 0x2
#define CALLTYPE_CALLBACK 0x4
#define IPPP_VERSION "2.2.0"
struct pppcallinfo
{
int calltype;
unsigned char local_num[64];
unsigned char remote_num[64];
int charge_units;
};
#define PPPIOCGCALLINFO _IOWR('t',128,struct pppcallinfo)
#define PPPIOCBUNDLE _IOW('t',129,int)
#define PPPIOCGMPFLAGS _IOR('t',130,int)
#define PPPIOCSMPFLAGS _IOW('t',131,int)
#define PPPIOCSMPMTU _IOW('t',132,int)
#define PPPIOCSMPMRU _IOW('t',133,int)
#define PPPIOCGCOMPRESSORS _IOR('t',134,unsigned long [8])
#define PPPIOCSCOMPRESSOR _IOW('t',135,int)
#define PPPIOCGIFNAME _IOR('t',136, char [IFNAMSIZ] )
#define SC_MP_PROT 0x00000200
#define SC_REJ_MP_PROT 0x00000400
#define SC_OUT_SHORT_SEQ 0x00000800
#define SC_IN_SHORT_SEQ 0x00004000
#define SC_DECOMP_ON 0x01
#define SC_COMP_ON 0x02
#define SC_DECOMP_DISCARD 0x04
#define SC_COMP_DISCARD 0x08
#define SC_LINK_DECOMP_ON 0x10
#define SC_LINK_COMP_ON 0x20
#define SC_LINK_DECOMP_DISCARD 0x40
#define SC_LINK_COMP_DISCARD 0x80
#define ISDN_PPP_COMP_MAX_OPTIONS 16
#define IPPP_COMP_FLAG_XMIT 0x1
#define IPPP_COMP_FLAG_LINK 0x2
struct isdn_ppp_comp_data {
int num;
unsigned char options[ISDN_PPP_COMP_MAX_OPTIONS];
int optlen;
int flags;
};
#endif /* _LINUX_ISDN_PPP_H */
++++++ linux.isdnif.h.txt ++++++
/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
/* $Id: isdnif.h,v 1.43.2.2 2004/01/12 23:08:35 keil Exp $
*
* Linux ISDN subsystem
* Definition of the interface between the subsystem and its low-level drivers.
*
* Copyright 1994,95,96 by Fritz Elfert (fr...@isdn4linux.de)
* Copyright 1995,96 Thinking Objects Software GmbH Wuerzburg
*
* This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference.
*
*/
#ifndef __ISDNIF_H__
#define __ISDNIF_H__
/*
* Values for general protocol-selection
*/
#define ISDN_PTYPE_UNKNOWN 0 /* Protocol undefined */
#define ISDN_PTYPE_1TR6 1 /* german 1TR6-protocol */
#define ISDN_PTYPE_EURO 2 /* EDSS1-protocol */
#define ISDN_PTYPE_LEASED 3 /* for leased lines */
#define ISDN_PTYPE_NI1 4 /* US NI-1 protocol */
#define ISDN_PTYPE_MAX 7 /* Max. 8 Protocols */
/*
* Values for Layer-2-protocol-selection
*/
#define ISDN_PROTO_L2_X75I 0 /* X75/LAPB with I-Frames */
#define ISDN_PROTO_L2_X75UI 1 /* X75/LAPB with UI-Frames */
#define ISDN_PROTO_L2_X75BUI 2 /* X75/LAPB with UI-Frames */
#define ISDN_PROTO_L2_HDLC 3 /* HDLC */
#define ISDN_PROTO_L2_TRANS 4 /* Transparent (Voice) */
#define ISDN_PROTO_L2_X25DTE 5 /* X25/LAPB DTE mode */
#define ISDN_PROTO_L2_X25DCE 6 /* X25/LAPB DCE mode */
#define ISDN_PROTO_L2_V11096 7 /* V.110 bitrate adaption 9600 Baud */
#define ISDN_PROTO_L2_V11019 8 /* V.110 bitrate adaption 19200 Baud */
#define ISDN_PROTO_L2_V11038 9 /* V.110 bitrate adaption 38400 Baud */
#define ISDN_PROTO_L2_MODEM 10 /* Analog Modem on Board */
#define ISDN_PROTO_L2_FAX 11 /* Fax Group 2/3 */
#define ISDN_PROTO_L2_HDLC_56K 12 /* HDLC 56k */
#define ISDN_PROTO_L2_MAX 15 /* Max. 16 Protocols */
/*
* Values for Layer-3-protocol-selection
*/
#define ISDN_PROTO_L3_TRANS 0 /* Transparent */
#define ISDN_PROTO_L3_TRANSDSP 1 /* Transparent with DSP */
#define ISDN_PROTO_L3_FCLASS2 2 /* Fax Group 2/3 CLASS 2 */
#define ISDN_PROTO_L3_FCLASS1 3 /* Fax Group 2/3 CLASS 1 */
#define ISDN_PROTO_L3_MAX 7 /* Max. 8 Protocols */
#endif /* __ISDNIF_H__ */
