Accepting request 841944 from home:dirkmueller:branches:devel:libraries:c_c++

- update to 1.14:
  * many fixes included 
- remove libdnet-autoreconf.patch
  libdnet-config-multilib.patch
  libdnet-fortify.patch
  reproducible.patch: drop (upstream)
- skip-test-subdir.patch: skip building tests, we don't need
  to install them and don't run them

OBS-URL: https://build.opensuse.org/request/show/841944
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libdnet?expand=0&rev=22
This commit is contained in:
Tomáš Chvátal 2020-10-16 06:31:44 +00:00 committed by Git OBS Bridge
parent 061da6998a
commit 91371fd0d0
9 changed files with 33 additions and 87 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b6360659c93fa2e3cde9e0a1fc9c07bc4111f3448c5de856e095eb98315dd424
size 959945

3
libdnet-1.14.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:592599c54a57102a177270f3a2caabda2c2ac7768b977d7458feba97da923dfe
size 520833

View File

@ -1,12 +0,0 @@
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -6,7 +6,6 @@ dnl
dnl $Id$
AC_INIT(include/dnet.h)
-AC_CONFIG_AUX_DIR(config)
AC_SUBST(ac_aux_dir)
AM_INIT_AUTOMAKE(libdnet, 1.12)

View File

@ -1,15 +0,0 @@
--- dnet-config.in.old 2014-03-14 11:40:27.332135003 +0000
+++ dnet-config.in 2014-03-14 11:41:08.624931401 +0000
@@ -45,10 +45,10 @@
done
if test "$echo_cflags" = "yes"; then
- echo -I@includedir@
+ echo
fi
if test "$echo_libs" = "yes"; then
- echo -L@libdir@ -ldnet @LIBS@
+ echo -ldnet @LIBS@
fi

View File

@ -1,13 +0,0 @@
Index: libdnet-libdnet-1.12/python/dnet.c
===================================================================
--- libdnet-libdnet-1.12.orig/python/dnet.c
+++ libdnet-libdnet-1.12/python/dnet.c
@@ -20,6 +20,8 @@
#endif
__PYX_EXTERN_C double pow(double, double);
#include "dnet.h"
+#include <string.h>
+#include <bsd/string.h>
typedef struct {const char *s; const void **p;} __Pyx_CApiTabEntry; /*proto*/

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Oct 15 14:16:52 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- update to 1.14:
* many fixes included
- remove libdnet-autoreconf.patch
libdnet-config-multilib.patch
libdnet-fortify.patch
reproducible.patch: drop (upstream)
- skip-test-subdir.patch: skip building tests, we don't need
to install them and don't run them
-------------------------------------------------------------------
Wed Mar 18 11:12:53 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -17,20 +17,14 @@
Name: libdnet
Version: 1.12
Version: 1.14
Release: 0
Summary: Library for Portable Interface to Low-Level Networking Routines
License: BSD-3-Clause
URL: https://github.com/dugsong/libdnet
Source0: https://github.com/dugsong/libdnet/archive/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM: properly name the dirs for new autoreconf to work
Patch0: libdnet-autoreconf.patch
# PATCH-FIX-UPSTREAM: work properly on multilib systems (from Fedora)
Patch1: libdnet-config-multilib.patch
# PATCH-FIX-UPSTREAM: do include string.h when needed, this is autogenerated
# file which can't be generated with today tools :(
Patch2: libdnet-fortify.patch
Patch3: reproducible.patch
# Skip the test subdir, as installing that is not necessary
Patch1: skip-test-subdir.patch
BuildRequires: libbsd-devel
BuildRequires: libtool
@ -74,10 +68,7 @@ networking routines, including:
%prep
%setup -q -n %{name}-%{name}-%{version}
%patch0
%patch1
%patch2 -p1
%patch3 -p1
%autopatch -p1
%build
ACLOCAL="aclocal -I config" autoreconf -fvi
@ -96,8 +87,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files devel
%license LICENSE
%doc README TODO THANKS
%{_sbindir}/*
%doc README.md TODO THANKS
%{_bindir}/dnet-config
%{_includedir}/dnet.h
%dir %{_includedir}/dnet

View File

@ -1,29 +0,0 @@
Author: Bernhard M. Wiedemann <bwiedemann suse de>
Date: 2017-09-02
https://github.com/dugsong/libdnet/pull/42
https://bugzilla.opensuse.org/show_bug.cgi?id=1041090
sort linker file list
so that dnet.so builds in a reproducible way
in spite of indeterministic filesystem readdir order
and http://bugs.python.org/issue30461
See https://reproducible-builds.org/ for why this is good.
This allows the libdnet package in openSUSE Tumbleweed
to produce identical rpms on different builds.
Index: libdnet-libdnet-1.12/python/setup.py.in
===================================================================
--- libdnet-libdnet-1.12.orig/python/setup.py.in
+++ libdnet-libdnet-1.12/python/setup.py.in
@@ -20,7 +20,7 @@ else:
# XXX - can't build on Cygwin+MinGW yet.
#if sys.platform == 'cygwin':
# dnet_extargs.append('-mno-cygwin')
- dnet_extobj.extend(glob.glob('@top_builddir@/src/.libs/*.o'))
+ dnet_extobj.extend(sorted(glob.glob('@top_builddir@/src/.libs/*.o')))
dnet = Extension('dnet',
dnet_srcs,

13
skip-test-subdir.patch Normal file
View File

@ -0,0 +1,13 @@
Index: libdnet-libdnet-1.14/Makefile.am
===================================================================
--- libdnet-libdnet-1.14.orig/Makefile.am
+++ libdnet-libdnet-1.14/Makefile.am
@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common
-SUBDIRS = include man src python test
+SUBDIRS = include man src python
bin_SCRIPTS = dnet-config