diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..92c948b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libdnet-1.12.tgz diff --git a/.libdnet.metadata b/.libdnet.metadata new file mode 100644 index 0000000..9b18657 --- /dev/null +++ b/.libdnet.metadata @@ -0,0 +1 @@ +71302be302e84fc19b559e811951b5d600d976f8 SOURCES/libdnet-1.12.tgz diff --git a/SOURCES/dnet-config-multilib.patch b/SOURCES/dnet-config-multilib.patch new file mode 100644 index 0000000..78ba3f3 --- /dev/null +++ b/SOURCES/dnet-config-multilib.patch @@ -0,0 +1,15 @@ +--- 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 + diff --git a/SOURCES/libdnet-shrext.patch b/SOURCES/libdnet-shrext.patch new file mode 100644 index 0000000..6d8df23 --- /dev/null +++ b/SOURCES/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/SPECS/libdnet.spec b/SPECS/libdnet.spec new file mode 100644 index 0000000..22ece0c --- /dev/null +++ b/SPECS/libdnet.spec @@ -0,0 +1,151 @@ +Summary: Simple portable interface to lowlevel networking routines +Name: libdnet + +Version: 1.12 +Release: 13.1%{?dist} + +License: BSD +URL: http://code.google.com/p/%{name}/ + +Source: http://%{name}.googlecode.com/files/%{name}-%{version}.tgz +Patch0: %{name}-shrext.patch +Patch1: dnet-config-multilib.patch + +%description +libdnet provides a simplified, portable interface to several +low-level networking routines, including network address +manipulation, kernel arp(4) cache and route(4) table lookup and +manipulation, network firewalling (IP filter, ipfw, ipchains, +pf, ...), network interface lookup and manipulation, raw IP +packet and Ethernet frame, and data transmission. + +%package devel +Summary: Header files for libdnet library +Requires: %{name} = %{version}-%{release} + +%description devel +%{summary}. + +%package progs +Summary: Sample applications to use with libdnet +Requires: %{name} = %{version}-%{release} + +%description progs +%{summary}. + +%package python +Summary: Python bindings for libdnet +Requires: %{name} = %{version}-%{release} +BuildRequires: python-devel + +%description python +%{summary}. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p0 + +%build +%configure --disable-static +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%{__make} %{?_smp_mflags} + +pushd python +%{__python} setup.py build +popd + +%install +%{__make} install DESTDIR=%{buildroot} + +pushd python +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +popd + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%doc LICENSE README THANKS TODO +%{_libdir}/*.so.* + +%files devel +%{_bindir}/* +%{_libdir}/*.so +%exclude %{_libdir}/*.la +%{_includedir}/* +%{_mandir}/man3/*.3* + +%files progs +%{_sbindir}/* +%{_mandir}/man8/*.8* + +%files python +%{python_sitearch}/* + +%changelog +* Fri Mar 14 2014 Richard W.M. Jones - 1.12-13.1.el7 +- Add patch to fix multilib conflicts in dnet-config + resolves: rhbz#1059593 +- Remove RPM cruft from the spec file. + +* Fri Jan 24 2014 Daniel Mach - 1.12-13 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1.12-12 +- Mass rebuild 2013-12-27 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.12-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Dec 30 2012 Oliver Falk - 1.12-10 +- Add python bindings in -python subpackage (BZ#815524) + +* Thu Jul 19 2012 Fedora Release Engineering - 1.12-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 1.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Feb 12 2010 Oliver Falk - 1.12-6 +- Disable build of static libs + +* Fri Jul 24 2009 Fedora Release Engineering - 1.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 13 2008 Patrick "Jima" Laughton 1.12-3 +- Bump-n-build for GCC 4.3 + +* Tue Aug 21 2007 Patrick "Jima" Laughton 1.12-2 +- Rebuild for BuildID +- Changed license tag to be more conformant + +* Thu Feb 15 2007 Patrick "Jima" Laughton 1.12-1 +- New upstream version +- New upstream web site (thanks JPO!) +- Patch for inconsistent shrext variable +- Minor edits for consistency + +* Wed Jan 24 2007 Patrick "Jima" Laughton 1.10-5 +- Converted spec to UTF-8 to fix BZ#222794 + +* Wed Oct 04 2006 Patrick "Jima" Laughton 1.10-4 +- Bump-n-build +- Reverted to 1.10; 1.11 has some serious issues + +* Tue Sep 19 2006 Patrick "Jima" Laughton - 1.10-3 +- Bump for FC6 rebuild + +* Thu Jul 14 2005 Oliver Falk - 1.10-2 +- Integrate Josщ's patch after reviewing the pkg. + +* Fri Jul 08 2005 Oliver Falk - 1.10-1 +- Build for FE