From 180fcc3c03314368c70fc9ea80fb2e256566babd901f952ab1c4721be7122d7d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 23 Nov 2023 16:20:05 +0000 Subject: [PATCH 1/2] Accepting request 1127734 from home:dspinella:branches:network:utilities - Update to 5.5.20: * Added the .gn TLD server. * Removed 6 new gTLDs which are no longer active. * Enabled getopt_long(3) support on Solaris. - Add rpmlintrc file * whois-rpmlintrc OBS-URL: https://build.opensuse.org/request/show/1127734 OBS-URL: https://build.opensuse.org/package/show/network:utilities/whois?expand=0&rev=141 --- whois.asc | 16 ++++++++-------- whois.changes | 10 ++++++++++ whois.spec | 9 ++++++--- whois_5.5.19.tar.xz | 3 --- whois_5.5.20.tar.xz | 3 +++ 5 files changed, 27 insertions(+), 14 deletions(-) delete mode 100644 whois_5.5.19.tar.xz create mode 100644 whois_5.5.20.tar.xz diff --git a/whois.asc b/whois.asc index a35b9f7..e8e5851 100644 --- a/whois.asc +++ b/whois.asc @@ -5,7 +5,7 @@ Format: 3.0 (native) Source: whois Binary: whois Architecture: any -Version: 5.5.19 +Version: 5.5.20 Maintainer: Marco d'Itri Standards-Version: 4.6.2.0 Vcs-Browser: https://github.com/rfc1036/whois @@ -14,16 +14,16 @@ Build-Depends: debhelper-compat (= 13), gettext, pkg-config, bash-completion, li Package-List: whois deb net standard arch=any Checksums-Sha1: - df8fcecb33989669385dbe8b26e2cd0c33ec7825 90728 whois_5.5.19.tar.xz + 354c79b0844aa7e1cb4d1d6aa6ce7ccd888684fe 90880 whois_5.5.20.tar.xz Checksums-Sha256: - f92817716e85e2e30851eab565d69c48ddbcb61ab92634a2a5fdff8ee7b26876 90728 whois_5.5.19.tar.xz + 42085102dfad82067abe2d5d1cfca59586573dee528718559b022e762bb85cf1 90880 whois_5.5.20.tar.xz Files: - e719aef49e4ca3ff959fe4e18c3dd4a2 90728 whois_5.5.19.tar.xz + e4fb517a6e26e78198f7f94625a5c59d 90880 whois_5.5.20.tar.xz -----BEGIN PGP SIGNATURE----- -iHUEARYIAB0WIQQnKUXNg20437dCfobLPsM64d7XgQUCZSMYxwAKCRDLPsM64d7X -gZsfAPwNd2hJMwOSGFfo+RfD91jBdvNf3PqsLlwVr9IOA5WUnQEAwgkyD/YgbiWp -dyajTFtm+6yfE7JBEHl1mDGkOIG5RAo= -=VXtB +iHUEARYIAB0WIQQnKUXNg20437dCfobLPsM64d7XgQUCZU495QAKCRDLPsM64d7X +geUaAQCccSpi2JpfM4eTSjQYoI1xkLw4IVcZzbc4VOD+O2eTKgD9FRnwi/r1lQiG +g54KbTxzbYkIUYOwjWzxMsAqzEcLiAQ= +=/wp+ -----END PGP SIGNATURE----- diff --git a/whois.changes b/whois.changes index ec0dead..7995250 100644 --- a/whois.changes +++ b/whois.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Nov 20 15:46:28 UTC 2023 - Danilo Spinella + +- Update to 5.5.20: + * Added the .gn TLD server. + * Removed 6 new gTLDs which are no longer active. + * Enabled getopt_long(3) support on Solaris. +- Add rpmlintrc file + * whois-rpmlintrc + ------------------------------------------------------------------- Sun Oct 22 07:56:29 UTC 2023 - Andreas Stieger diff --git a/whois.spec b/whois.spec index 9806051..bb9cdac 100644 --- a/whois.spec +++ b/whois.spec @@ -17,7 +17,7 @@ Name: whois -Version: 5.5.19 +Version: 5.5.20 Release: 0 Summary: Intelligent WHOIS client License: GPL-2.0-or-later @@ -51,6 +51,7 @@ Group: System/Shells Requires: %{name} Requires: bash-completion Supplements: (%{name} and bash-completion) +BuildArch: noarch %description bash-completion bash command line completion support for whois. @@ -77,6 +78,8 @@ mkdir -p %{buildroot}{%{_prefix}/bin,%{_mandir}/man1} make BASEDIR=%{buildroot} mandir=%{_mandir} prefix=%{_prefix} \ install install-mkpasswd install-pos %find_lang %{name} +mkdir -p %{buildroot}%{_datadir}/bash-completion/completions +mv %{buildroot}%{_sysconfdir}/bash_completion.d/{mkpasswd,whois} %{buildroot}%{_datadir}/bash-completion/completions %files -f %{name}.lang %license COPYING @@ -87,7 +90,7 @@ make BASEDIR=%{buildroot} mandir=%{_mandir} prefix=%{_prefix} \ %{_mandir}/man5/*.5%{?ext_man} %files bash-completion -%{_sysconfdir}/bash_completion.d/whois -%{_sysconfdir}/bash_completion.d/mkpasswd +%{_datadir}/bash-completion/completions/whois +%{_datadir}/bash-completion/completions/mkpasswd %changelog diff --git a/whois_5.5.19.tar.xz b/whois_5.5.19.tar.xz deleted file mode 100644 index f9380f9..0000000 --- a/whois_5.5.19.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f92817716e85e2e30851eab565d69c48ddbcb61ab92634a2a5fdff8ee7b26876 -size 90728 diff --git a/whois_5.5.20.tar.xz b/whois_5.5.20.tar.xz new file mode 100644 index 0000000..dd81757 --- /dev/null +++ b/whois_5.5.20.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42085102dfad82067abe2d5d1cfca59586573dee528718559b022e762bb85cf1 +size 90880 From ddabcad0a24b5860795d666f67b59b1b635b41acaf8873577f83d5767b39f9df Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Fri, 24 Nov 2023 15:03:48 +0000 Subject: [PATCH 2/2] Accepting request 1128610 from home:dspinella:branches:network:utilities - Fix build on SLE * whois-remove-malloc-attribute.patch OBS-URL: https://build.opensuse.org/request/show/1128610 OBS-URL: https://build.opensuse.org/package/show/network:utilities/whois?expand=0&rev=142 --- whois-remove-malloc-attribute.patch | 13 +++++++++++++ whois-rpmlintrc | 3 +++ whois.changes | 6 ++++++ whois.spec | 2 ++ 4 files changed, 24 insertions(+) create mode 100644 whois-remove-malloc-attribute.patch create mode 100644 whois-rpmlintrc diff --git a/whois-remove-malloc-attribute.patch b/whois-remove-malloc-attribute.patch new file mode 100644 index 0000000..31e9dd6 --- /dev/null +++ b/whois-remove-malloc-attribute.patch @@ -0,0 +1,13 @@ +Index: whois/utils.h +=================================================================== +--- whois.orig/utils.h ++++ whois/utils.h +@@ -24,7 +24,7 @@ + # define NONNULL + # define UNUSED + #endif +-#if defined __GNUC__ && !defined __clang__ ++#if defined __GNUC__ && __GNUC__ >= 13 && !defined __clang__ + # define MALLOC_FREE __attribute__((malloc(free))) + #else + # define MALLOC_FREE diff --git a/whois-rpmlintrc b/whois-rpmlintrc new file mode 100644 index 0000000..1a916b9 --- /dev/null +++ b/whois-rpmlintrc @@ -0,0 +1,3 @@ +# WHOIS is the name of the RFC +addFilter("name-repeated-in-summary") + diff --git a/whois.changes b/whois.changes index 7995250..144d86e 100644 --- a/whois.changes +++ b/whois.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 24 14:53:29 UTC 2023 - Danilo Spinella + +- Fix build on SLE + * whois-remove-malloc-attribute.patch + ------------------------------------------------------------------- Mon Nov 20 15:46:28 UTC 2023 - Danilo Spinella diff --git a/whois.spec b/whois.spec index bb9cdac..db47acd 100644 --- a/whois.spec +++ b/whois.spec @@ -26,7 +26,9 @@ URL: https://github.com/rfc1036/whois Source: https://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.xz Source2: https://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.dsc#/%{name}.asc Source3: https://db.debian.org/fetchkey.cgi?fingerprint=6791403B68AE2690517C42EAE6FFF1E38DC968B0#/%{name}.keyring +Source4: %{name}-rpmlintrc Patch0: whois-nobsdsource.patch +Patch1: whois-remove-malloc-attribute.patch BuildRequires: pkgconfig BuildRequires: xz BuildRequires: pkgconfig(libidn2)