From 9cce046be88b0dd10db80a6c7b7aa5c2fa5bb807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Wed, 1 Aug 2018 11:54:10 +0200
Subject: [PATCH] New upstream release

---
 libxcrypt-4.1.0_fix_automake.patch | 63 ------------------------------
 libxcrypt.spec                     |  7 ++--
 sources                            |  2 +-
 3 files changed, 5 insertions(+), 67 deletions(-)
 delete mode 100644 libxcrypt-4.1.0_fix_automake.patch

diff --git a/libxcrypt-4.1.0_fix_automake.patch b/libxcrypt-4.1.0_fix_automake.patch
deleted file mode 100644
index 035be5e..0000000
--- a/libxcrypt-4.1.0_fix_automake.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 77bbad4d3aafc20bf8532de2f6215bb8bb4a02a5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
-Date: Fri, 13 Jul 2018 21:58:02 +0200
-Subject: [PATCH] Makefile: Fix warnings from automake
-
----
- Makefile.am | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8605ce7..f5e8df4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -37,9 +37,11 @@ libcrypt_la_SOURCES = \
- 
- pkgconfig_DATA = libxcrypt.pc
- # Install libcrypt.pc symlink to libxcrypt.pc file.
--.PHONY: install-data-hook-pkgconfig uninstall-hook-pkgconfig
-+phony_targets = \
-+	install-data-hook-pkgconfig uninstall-hook-pkgconfig
- install-data-hook: install-data-hook-pkgconfig
--uninstall-hook: uninstall-hook-pkgconfig
-+uninstall_hook_targets = \
-+	uninstall-hook-pkgconfig
- install-data-hook-pkgconfig:
- 	cd $(DESTDIR)$(pkgconfigdir) && \
- 		$(LN_S) libxcrypt.pc libcrypt.pc
-@@ -110,9 +112,11 @@ if ENABLE_COMPAT_SUSE
- # shipped libowcrypt.so.1.)
- if ENABLE_OBSOLETE_API
- if ENABLE_STATIC
--.PHONY: install-exec-hook-libstatic uninstall-hook-libstatic
-+phony_targets += \
-+	install-exec-hook-libstatic uninstall-hook-libstatic
- install-exec-hook: install-exec-hook-libstatic
--uninstall-hook: uninstall-hook-libstatic
-+uninstall_hook_targets += \
-+	uninstall-hook-libstatic
- install-exec-hook-libstatic:
- 	cd $(DESTDIR)$(libdir) && \
- 		$(LN_S) libcrypt.a libowcrypt.a
-@@ -120,9 +124,11 @@ uninstall-hook-libstatic:
- 	-rm -f $(DESTDIR)$(libdir)/libowcrypt.a
- endif
- if ENABLE_SHARED
--.PHONY: install-exec-hook-libshared uninstall-hook-libshared
-+phony_targets += \
-+	install-exec-hook-libshared uninstall-hook-libshared
- install-exec-hook: install-exec-hook-libshared
--uninstall-hook: uninstall-hook-libshared
-+uninstall_hook_targets += \
-+	uninstall-hook-libshared
- install-exec-hook-libshared:
- 	cd $(DESTDIR)$(libdir) && \
- 		$(LN_S) libcrypt.so libowcrypt.so && \
-@@ -215,3 +221,7 @@ endif
- # will reveal the direct dependency) but a few don't.
- $(libcrypt_la_OBJECTS): crypt-symbol-vers.h crypt-hashes.h
- $(test_byteorder_OBJECTS): crypt-symbol-vers.h crypt-hashes.h
-+
-+# Add additional targets
-+.PHONY: $(phony_targets)
-+uninstall-hook: $(uninstall_hook_targets)
diff --git a/libxcrypt.spec b/libxcrypt.spec
index 4ff9884..88b2cce 100644
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -18,7 +18,7 @@
 
 
 Name:           libxcrypt
-Version:        4.1.0
+Version:        4.1.1
 Release:        1%{?dist}
 Summary:        Extended crypt library for DES, MD5, Blowfish and others
 
@@ -28,8 +28,6 @@ License:        LGPLv2+ and BSD and Public Domain
 URL:            https://github.com/besser82/%{name}
 Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-Patch0:         %{url}/commit/77bbad4.patch#/%{name}-4.1.0_fix_automake.patch
-
 BuildRequires:  fipscheck
 BuildRequires:  libtool
 
@@ -177,6 +175,9 @@ is highly discouraged.
 
 
 %changelog
+* Wed Aug 01 2018 Björn Esser <besser82@fedoraproject.org> - 4.1.1-1
+- New upstream release
+
 * Fri Jul 13 2018 Björn Esser <besser82@fedoraproject.org> - 4.1.0-1
 - New upstream release
 
diff --git a/sources b/sources
index dde52ac..8659c8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libxcrypt-4.1.0.tar.gz) = a4b0b0fb683df91a01b475ab0b2625d3c5d34c296885b7b23cffb412afb734933f9b314729853e4c58c68934b1c411a27388edf0055f019c9aeef8f1512fb9a6
+SHA512 (libxcrypt-4.1.1.tar.gz) = 64f9453ffd0128e65dbafb981e5ee0e20eb1dcabae6290053a9ad30a071e37c8f970c83d2c58c61bddc7f3793af2e32344260cbfc9a69af8beca0b1650e44dff