[packages/shishi] - updated to 1.0.3

[qboosh]

commit 2fd9b4244fd21dd5f3e307bb63c53a92be326748
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Sep 4 19:15:57 2023 +0200

    - updated to 1.0.3

 libgcrypt-1.6.patch | 15 ---------------
 shishi-pam.patch    |  9 +++------
 shishi.spec         | 23 +++++++++--------------
 3 files changed, 12 insertions(+), 35 deletions(-)
---
diff --git a/shishi.spec b/shishi.spec
index 6ceba81..aef5f10 100644
--- a/shishi.spec
+++ b/shishi.spec
@@ -1,19 +1,18 @@
 Summary:	Shishi - an implementation of RFC 1510(bis) (Kerberos V5 authentication)
 Summary(pl.UTF-8):	Shishi - implementacja RFC 1510(bis) (uwierzytelniania Kerberos V5)
 Name:		shishi
-Version:	1.0.2
-Release:	6
+Version:	1.0.3
+Release:	1
 Epoch:		0
 License:	GPL v3+
 Group:		Libraries
-Source0:	http://ftp.gnu.org/gnu/shishi/%{name}-%{version}.tar.gz
-# Source0-md5:	4dace6fdc67dec508ed75b852d316e64
+Source0:	https://ftp.gnu.org/gnu/shishi/%{name}-%{version}.tar.gz
+# Source0-md5:	b0189e3a756bf9a93edfb45c0a250151
 Source1:	%{name}-shishid.init
 Source2:	%{name}-shishid.sysconfig
 Patch0:		%{name}-info.patch
-Patch1:		libgcrypt-1.6.patch
 Patch2:		%{name}-pam.patch
-URL:		http://josefsson.org/shishi/
+URL:		http://www.gnu.org/software/shishi/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	gettext-tools >= 0.18.1
@@ -32,8 +31,8 @@ Requires:	libtasn1 >= 2.11
 Provides:	group(shishi)
 Provides:	user(shishi)
 # should be moved to shishi-enabled inetutils-* if such packages would exist
-Obsoletes:	shishi-telnet
-Obsoletes:	shishi-telnetd
+Obsoletes:	shishi-telnet < 0:0.0.8
+Obsoletes:	shishi-telnetd < 0:0.0.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir	%{_sbindir}
@@ -120,7 +119,7 @@ Summary:	PAM module for RFC 1510 (Kerberos V5) authentication
 Summary(pl.UTF-8):	Moduł PAM do uwierzytelniania RFC 1510 (Kerberos V5)
 Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	pam_shishi
+Obsoletes:	pam_shishi < 0:0.0.0-1
 
 %description -n pam-pam_shishi
 PAM module for RFC 1510 (Kerberos V5) authentication.
@@ -131,15 +130,11 @@ Moduł PAM do uwierzytelniania RFC 1510 (Kerberos V5).
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
-# doesn't build on sparc (too few B* constants) and wasn't packaged anyway
-%{__perl} -pi -e 's/^(SUBDIRS.*) rsh-redone/$1/' extra/Makefile.am
-
 %build
 %{__libtoolize}
-%{__aclocal} -I gl/m4 -I src/gl/m4 -I db/gl/m4 -I m4
+%{__aclocal} -I m4 -I lib/gl/m4 -I src/gl/m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
diff --git a/libgcrypt-1.6.patch b/libgcrypt-1.6.patch
deleted file mode 100644
index f596f4e..0000000
--- a/libgcrypt-1.6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- shishi-1.0.2/gl/m4/gc.m4~	2013-04-03 00:48:10.000000000 +0200
-+++ shishi-1.0.2/gl/m4/gc.m4	2014-01-02 17:26:39.579388941 +0100
-@@ -9,12 +9,6 @@
-   if test "$libgcrypt" != no; then
-     AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [
- #include <gcrypt.h>
--/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
--   will fail on startup if we don't have 1.4.4 or later, so
--   test for it early. */
--#if !defined GCRY_MODULE_ID_USER
--error too old libgcrypt
--#endif
- ])
-   fi
- ])
diff --git a/shishi-pam.patch b/shishi-pam.patch
index 298bf8b..b6b0f5c 100644
--- a/shishi-pam.patch
+++ b/shishi-pam.patch
@@ -1,11 +1,8 @@
 PAM module no longer compiles in static mode.
---- shishi-1.0.2/extra/pam_shishi/Makefile.am.orig	2013-04-03 10:31:20.000000000 +0200
-+++ shishi-1.0.2/extra/pam_shishi/Makefile.am	2017-04-10 17:41:58.205488834 +0200
-@@ -28,6 +28,7 @@
+--- shishi-1.0.3/extra/pam_shishi/Makefile.am.orig	2013-04-03 10:31:20.000000000 +0200
++++ shishi-1.0.3/extra/pam_shishi/Makefile.am	2017-04-10 17:41:58.205488834 +0200
+@@ -28,3 +28,4 @@
  pam_shishi_la_LIBADD = ../../lib/libshishi.la
  # XXX add -Wl,-x too?  PAM documentation suggests it.
  pam_shishi_la_LDFLAGS = -module -shared -avoid-version
 +pam_shishi_la_CFLAGS = -shared
- 
- # -DDEBUG_PAM
- DEFS = @DEFS@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/shishi.git/commitdiff/2fd9b4244fd21dd5f3e307bb63c53a92be326748