diff --git a/.gitignore b/.gitignore index bedba59..a00fa29 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ echoping-6.0.2.tar.gz +/echoping-6.0.2_r434.tar.xz +/echoping-6.1-BETA_r434.tar.xz diff --git a/echoping-6.0.2-no-so-version.patch b/echoping-6.0.2-no-so-version.patch new file mode 100644 index 0000000..dc6aaf2 --- /dev/null +++ b/echoping-6.0.2-no-so-version.patch @@ -0,0 +1,59 @@ +diff -ur echoping-6.0.2/plugins/dns/Makefile.am echoping-6.0.2-avoid-version/plugins/dns/Makefile.am +--- echoping-6.0.2/plugins/dns/Makefile.am 2007-04-05 14:40:48.000000000 +0200 ++++ echoping-6.0.2-avoid-version/plugins/dns/Makefile.am 2012-08-20 21:49:39.688195883 +0200 +@@ -1,7 +1,7 @@ + if DNSBUILD + pkglib_LTLIBRARIES = dns.la + dns_la_SOURCES = dns.c +-dns_la_LDFLAGS = -module ++dns_la_LDFLAGS = -module -avoid-version + endif + + man_MANS = echoping_dns.1 +diff -ur echoping-6.0.2/plugins/ldap/Makefile.am echoping-6.0.2-avoid-version/plugins/ldap/Makefile.am +--- echoping-6.0.2/plugins/ldap/Makefile.am 2007-04-05 14:40:48.000000000 +0200 ++++ echoping-6.0.2-avoid-version/plugins/ldap/Makefile.am 2012-08-20 21:49:46.858195831 +0200 +@@ -1,7 +1,7 @@ + if LDAPBUILD + pkglib_LTLIBRARIES = ldap.la + ldap_la_SOURCES = ldap.c +-ldap_la_LDFLAGS = -module ++ldap_la_LDFLAGS = -module -avoid-version + endif + man_MANS = echoping_ldap.1 + +diff -ur echoping-6.0.2/plugins/postgresql/Makefile.am echoping-6.0.2-avoid-version/plugins/postgresql/Makefile.am +--- echoping-6.0.2/plugins/postgresql/Makefile.am 2007-04-05 14:40:48.000000000 +0200 ++++ echoping-6.0.2-avoid-version/plugins/postgresql/Makefile.am 2012-08-20 21:49:52.708195789 +0200 +@@ -1,7 +1,7 @@ + if PGSQLBUILD + pkglib_LTLIBRARIES = postgresql.la + postgresql_la_SOURCES = postgresql.c +-postgresql_la_LDFLAGS = -module ++postgresql_la_LDFLAGS = -module -avoid-version + endif + man_MANS = echoping_postgresql.1 + +diff -ur echoping-6.0.2/plugins/random/Makefile.am echoping-6.0.2-avoid-version/plugins/random/Makefile.am +--- echoping-6.0.2/plugins/random/Makefile.am 2007-04-05 14:40:48.000000000 +0200 ++++ echoping-6.0.2-avoid-version/plugins/random/Makefile.am 2012-08-20 21:49:57.104862424 +0200 +@@ -1,5 +1,5 @@ + pkglib_LTLIBRARIES = random.la + random_la_SOURCES = random.c +-random_la_LDFLAGS = -module ++random_la_LDFLAGS = -module -avoid-version + man_MANS = echoping_random.1 + +diff -ur echoping-6.0.2/plugins/whois/Makefile.am echoping-6.0.2-avoid-version/plugins/whois/Makefile.am +--- echoping-6.0.2/plugins/whois/Makefile.am 2007-04-05 14:40:48.000000000 +0200 ++++ echoping-6.0.2-avoid-version/plugins/whois/Makefile.am 2012-08-20 21:50:01.441529059 +0200 +@@ -2,7 +2,7 @@ + + pkglib_LTLIBRARIES = whois.la + whois_la_SOURCES = whois.c +-whois_la_LDFLAGS = -module ++whois_la_LDFLAGS = -module -avoid-version + man_MANS = echoping_whois.1 + + EXTRA_DIST = $(man_MANS) test.sh + diff --git a/echoping-6.0.2-so.patch b/echoping-6.0.2-so.patch new file mode 100644 index 0000000..89b2cdf --- /dev/null +++ b/echoping-6.0.2-so.patch @@ -0,0 +1,12 @@ +diff -up echoping-6.0.2_r434/echoping.c.orig echoping-6.0.2_r434/echoping.c +--- echoping-6.0.2_r434/echoping.c.orig 2015-02-25 15:41:46.543676359 +0100 ++++ echoping-6.0.2_r434/echoping.c 2015-02-25 15:42:43.262222690 +0100 +@@ -471,7 +471,7 @@ main(argc, argv) + if (plugin_name) { + ext = strstr(plugin_name, ".so"); + if ((ext == NULL) || (strcmp(ext, ".so") != 0)) +- sprintf(plugin_name, "%s.so", plugin_name); ++ strcat(plugin_name, ".so"); + plugin = dlopen(plugin_name, RTLD_NOW); + if (!plugin) { + /* Retries with the absolute name */ diff --git a/echoping.spec b/echoping.spec index 0d25cd9..ecdb590 100644 --- a/echoping.spec +++ b/echoping.spec @@ -1,16 +1,26 @@ -Summary: TCP "echo" performance test +%define svn_rel 434 + Name: echoping -Version: 6.0.2 -Release: 13%{?dist} -License: GPLv2+ +Version: 6.1 +Release: 0.beta.r%{svn_rel}svn.1%{?dist} +Summary: TCP performance test to measure response time of network hosts Group: Applications/Internet -Source0: http://downloads.sourceforge.net/echoping/echoping-%{version}.tar.gz + +License: GPLv2+ URL: http://echoping.sourceforge.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# The source for this package was pulled from upstream's vcs. Use the +# following commands to generate the tarball: +# svn export -r 434 svn://svn.code.sf.net/p/echoping/svn/trunk/SRC/ echoping-6.1-BETA_r434 +# tar -cJvf echoping-6.1-BETA_r434.tar.xz echoping-6.1-BETA_r434 +Source0: %{name}-%{version}-BETA_r%{svn_rel}.tar.xz +Patch0: echoping-6.0.2-no-so-version.patch +Patch1: echoping-6.0.2-so.patch + BuildRequires: openssl-devel, libidn-devel, popt-devel, zlib-devel, openldap-devel, postgresql-devel +BuildRequires: autoconf, automake, libtool %description -Echoping is a small program to test (approximatively) performances of a +Echoping is a small program to test (approximate) performances of a remote host by sending TCP "echo" (or other protocol, such as HTTP) packets. @@ -60,9 +70,16 @@ developing applications that use %{name}. %prep -%setup -q +%setup -q -n %{name}-%{version}-BETA_r%{svn_rel} +%patch0 -p1 +%patch1 -p1 + %build +# Workaround for libtoolize not working correctly on older fedora releases. +# Can be dropped with EOL of f22 +ln -s /usr/share/libtool/config/ltmain.sh +./recreate-autofiles %configure \ --enable-icp \ --enable-http \ @@ -78,45 +95,54 @@ developing applications that use %{name}. %{__make} %{?_smp_mflags} + %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} # Clean .la files find %{buildroot} -name '*.la' | xargs rm -f + rm -f %{buildroot}%{_libdir}/echoping/random.* rm -f %{buildroot}%{_mandir}/man1/echoping_random.1* + %clean rm -rf %{buildroot} + %files %defattr(-, root, root, -) %doc AUTHORS COPYING ChangeLog README TODO DETAILS %{_bindir}/echoping +%dir %{_libdir}/echoping/ %{_mandir}/man1/echoping.1* %files dns %{_mandir}/man1/echoping_dns.1* -%{_libdir}/echoping/dns.so.* +%{_libdir}/echoping/dns.so %files ldap %{_mandir}/man1/echoping_ldap.1* -%{_libdir}/echoping/ldap.so.* +%{_libdir}/echoping/ldap.so %files postgresql %{_mandir}/man1/echoping_postgresql.1* -%{_libdir}/echoping/postgresql.so.* +%{_libdir}/echoping/postgresql.so %files whois %{_mandir}/man1/echoping_whois.1* -%{_libdir}/echoping/whois.so.* +%{_libdir}/echoping/whois.so %files devel %{_includedir}/echoping/ -%{_libdir}/echoping/*.so + %changelog +* Wed Feb 25 2015 Andreas Thienemann - 6.1-0.beta.r434svn.1 +- Updated to latest SVN, fixing #705174 and #1007031 +- Removed so versioning and fixed module loading, fixing #460557 and #1032547 + * Sat Aug 16 2014 Fedora Release Engineering - 6.0.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild @@ -163,5 +189,5 @@ rm -rf %{buildroot} * Fri Sep 08 2006 Andreas Thienemann - 5.2.0-2 - FE6 Rebuild -* Wed Mar 13 2006 Andreas Thienemann 5.2.0-1 +* Mon Mar 13 2006 Andreas Thienemann 5.2.0-1 - Initial FE release. diff --git a/sources b/sources index 83ba75b..c64860f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -991478532b56ab3b6f46ea9fa332626f echoping-6.0.2.tar.gz +30669e8ef1f2bc273ad3740f765e9e68 echoping-6.1-BETA_r434.tar.xz