commit bda8748f78740f8f564e21ce06229551cfd52743 Author: overweight <5324761+overweight@user.noreply.gitee.com> Date: Mon Sep 30 10:55:45 2019 -0400 Package init diff --git a/add-sorted-function-remove-differences.patch b/add-sorted-function-remove-differences.patch new file mode 100644 index 0000000..4a2eb71 --- /dev/null +++ b/add-sorted-function-remove-differences.patch @@ -0,0 +1,12 @@ +diff -Nuar libdnet-1.12/python/setup.py.in libdnet-1.12.new/python/setup.py.in +--- libdnet-1.12/python/setup.py.in 2006-01-18 23:50:29.000000000 -0500 ++++ libdnet-1.12.new/python/setup.py.in 2019-04-11 07:38:27.901000000 -0400 +@@ -20,7 +20,7 @@ + # 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, diff --git a/dnet-config-multilib.patch b/dnet-config-multilib.patch new file mode 100644 index 0000000..30cdefa --- /dev/null +++ b/dnet-config-multilib.patch @@ -0,0 +1,15 @@ +--- libdnet-1.12/dnet-config.in.old 2014-03-14 11:40:27.332135003 +0000 ++++ libdnet-1.12/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 + diff --git a/libdnet-1.12.tgz b/libdnet-1.12.tgz new file mode 100644 index 0000000..05e2882 Binary files /dev/null and b/libdnet-1.12.tgz differ diff --git a/libdnet-shrext.patch b/libdnet-shrext.patch new file mode 100644 index 0000000..6d8df23 --- /dev/null +++ b/libdnet-shrext.patch @@ -0,0 +1,327 @@ +diff -urN libdnet-1.12/configure libdnet-1.12-patched/configure +--- libdnet-1.12/configure 2007-01-20 05:39:54.000000000 -0600 ++++ libdnet-1.12-patched/configure 2007-02-15 09:06:27.000000000 -0600 +@@ -7053,7 +7053,7 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" ++ shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' + # The linker will automatically build a .lib file if we build a DLL. +@@ -7580,7 +7580,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -7693,7 +7693,7 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -7761,7 +7761,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' ++ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +@@ -7830,7 +7830,7 @@ + need_version=no + case "$host_cpu" in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -7845,7 +7845,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) +- shrext='.sl' ++ shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +@@ -7856,7 +7856,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) +- shrext='.sl' ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -7992,7 +7992,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -9201,7 +9201,7 @@ + libext="$libext" + + # Shared library suffix (normally ".so"). +-shrext='$shrext' ++shrext_cmds='$shrext_cmds' + + # Executable file suffix (normally ""). + exeext="$exeext" +@@ -11257,7 +11257,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -11370,7 +11370,7 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -11438,7 +11438,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' ++ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +@@ -11507,7 +11507,7 @@ + need_version=no + case "$host_cpu" in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -11522,7 +11522,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) +- shrext='.sl' ++ shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +@@ -11533,7 +11533,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) +- shrext='.sl' ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -11669,7 +11669,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -12751,7 +12751,7 @@ + libext="$libext" + + # Shared library suffix (normally ".so"). +-shrext='$shrext' ++shrext_cmds='$shrext_cmds' + + # Executable file suffix (normally ""). + exeext="$exeext" +@@ -13832,7 +13832,7 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" ++ shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' + # The linker will automatically build a .lib file if we build a DLL. +@@ -14359,7 +14359,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -14472,7 +14472,7 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -14540,7 +14540,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' ++ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +@@ -14609,7 +14609,7 @@ + need_version=no + case "$host_cpu" in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -14624,7 +14624,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) +- shrext='.sl' ++ shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +@@ -14635,7 +14635,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) +- shrext='.sl' ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -14771,7 +14771,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -15047,7 +15047,7 @@ + libext="$libext" + + # Shared library suffix (normally ".so"). +-shrext='$shrext' ++shrext_cmds='$shrext_cmds' + + # Executable file suffix (normally ""). + exeext="$exeext" +@@ -16130,7 +16130,7 @@ + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. +- shrext=".dll" ++ shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames=' + # The linker will automatically build a .lib file if we build a DLL. +@@ -16657,7 +16657,7 @@ + library_names_spec= + libname_spec='lib$name' + soname_spec= +-shrext=".so" ++shrext_cmds=".so" + postinstall_cmds= + postuninstall_cmds= + finish_cmds= +@@ -16770,7 +16770,7 @@ + + cygwin* | mingw* | pw32*) + version_type=windows +- shrext=".dll" ++ shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + +@@ -16838,7 +16838,7 @@ + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH +- shrext='$(test .$module = .yes && echo .so || echo .dylib)' ++ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` +@@ -16907,7 +16907,7 @@ + need_version=no + case "$host_cpu" in + ia64*) +- shrext='.so' ++ shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH +@@ -16922,7 +16922,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) +- shrext='.sl' ++ shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH +@@ -16933,7 +16933,7 @@ + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) +- shrext='.sl' ++ shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +@@ -17069,7 +17069,7 @@ + + os2*) + libname_spec='$name' +- shrext=".dll" ++ shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' +@@ -18151,7 +18151,7 @@ + libext="$libext" + + # Shared library suffix (normally ".so"). +-shrext='$shrext' ++shrext_cmds='$shrext_cmds' + + # Executable file suffix (normally ""). + exeext="$exeext" +@@ -18595,7 +18595,7 @@ + libext="$libext" + + # Shared library suffix (normally ".so"). +-shrext='$shrext' ++shrext_cmds='$shrext_cmds' + + # Executable file suffix (normally ""). + exeext="$exeext" diff --git a/libdnet.spec b/libdnet.spec new file mode 100644 index 0000000..9bdf87b --- /dev/null +++ b/libdnet.spec @@ -0,0 +1,104 @@ +Name: libdnet +Version: 1.12 +Release: 28 +Summary: Simple portable interface work with low-level networking routines + +License: BSD +URL: https://github.com/dugsong/%{name}/ +Source: http://%{name}.googlecode.com/files/%{name}-%{version}.tgz + +Patch0: %{name}-shrext.patch +Patch1: dnet-config-multilib.patch +Patch9000: add-sorted-function-remove-differences.patch + +BuildRequires: gcc-c++ + +%description +%{name} provides a simplified, portable interface to several low-level networking +routines, including network address manipulation, kernel arp and route table +manipulation, firewalling, interface configuration, IP tunnelling, and raw Ethernet +and IP datagram transmission. + +%package devel +Summary: Header files for %{name} +Requires: %{name} = %{version}-%{release} + +%description devel +%{name}-devel contains the header files for developing +applications that want to make use of %{name} + +%package progs +Summary: Sample applications to use with %{name} +Requires: %{name} = %{version}-%{release} + +%description progs +%{name}-progs contains sample applications that want to make use of %{name} + +%package -n python2-%{name} +%{?python_provide:%python_provide python2-%{name}} +Provides: %{name}-python = %{version}-%{release} +Obsoletes: %{name}-python +Summary: Python bindings for %{name} +Requires: %{name} = %{version}-%{release} +BuildRequires: python2-devel + +%description -n python2-%{name} +Python2 package for python-%{name} + +%package_help + +%prep +%autosetup -n %{name}-%{version} -p1 + +%build +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%configure +%disable_rpath + +%make_build + +pushd python +%{__python2} setup.py build +popd + +%install +%{__make} install DESTDIR=%{buildroot} + +pushd python +%{__python2} setup.py install --skip-build --root %{buildroot} +popd + +%delete_la + +%ldconfig_scriptlets + +%files +%defattr(-,root,root) +%license LICENSE +%{_libdir}/%{name}.so.* + +%files devel +%defattr(-,root,root) +%{_bindir}/dnet-config +%{_libdir}/%{name}.so +%{_includedir}/dnet/*.h +%{_includedir}/dnet.h +%{_libdir}/*.a + +%files progs +%defattr(-,root,root) +%{_sbindir}/* + +%files -n python2-%{name} +%defattr(-,root,root) +%{python2_sitearch}/* + +%files help +%defattr(-,root,root) +%doc README THANKS TODO +%{_mandir}/man3/*.3* +%{_mandir}/man8/*.8* + +%changelog +* Thu Sep 12 2019 openEuler Buildteam - 1.12 - 28 +- Package init