2
1
Эх сурвалжийг харах

package/cracklib: bump to version 2.9.8

Drop patch (already in version)

https://github.com/cracklib/cracklib/blob/v2.9.8/src/NEWS

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine 2 жил өмнө
parent
commit
d776c65fe9

+ 0 - 30
package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch

@@ -1,30 +0,0 @@
-From d27062fe7a520d5791f7a56d175a5cb6a39bae61 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= <stefan.sorensen@spectralink.com>
-Date: Tue, 18 Apr 2017 12:00:39 +0200
-Subject: [PATCH] Force grep to treat the input as text when formatting word
- files.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
----
- util/cracklib-format | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/cracklib-format b/util/cracklib-format
-index 1d7be5b..b1de8e8 100644
---- a/util/cracklib-format
-+++ b/util/cracklib-format
-@@ -4,7 +4,7 @@
- # into cracklib-packer
- #
- gzip -cdf "$@" |
--    grep -v '^\(#\|$\)' |
-+    grep -a -v '^\(#\|$\)' |
-     tr '[A-Z]' '[a-z]' |
-     tr -cd '\012[a-z][0-9]' |
-     env LC_ALL=C sort -u
--- 
-2.9.3
-

+ 2 - 2
package/cracklib/cracklib.hash

@@ -1,4 +1,4 @@
 # Locally calculated
-sha256  8b6fd202f3f1d8fa395d3b7a5d821227cfd8bb4a9a584a7ae30cf62cea6287dd  cracklib-2.9.7.tar.gz
-sha256  7f0c45faf84a2494f15d1e2720394aca4a379163a70c4acad948186c0047d389  cracklib-words-2.9.7.gz
+sha256  1f9d34385ea3aa7cd7c07fa388dc25810aea9d3c33e260c713a3a5873d70e386  cracklib-2.9.8.tar.bz2
+sha256  ec25ac4a474588c58d901715512d8902b276542b27b8dd197e9c2ad373739ec4  cracklib-words-2.9.8.bz2
 sha256  f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa  COPYING.LIB

+ 4 - 3
package/cracklib/cracklib.mk

@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-CRACKLIB_VERSION = 2.9.7
+CRACKLIB_VERSION = 2.9.8
+CRACKLIB_SOURCE = cracklib-$(CRACKLIB_VERSION).tar.bz2
 CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/v$(CRACKLIB_VERSION)
 CRACKLIB_LICENSE = LGPL-2.1
 CRACKLIB_LICENSE_FILES = COPYING.LIB
@@ -33,8 +34,8 @@ endif
 HOST_CRACKLIB_CONF_OPTS += --without-python --without-zlib
 
 ifeq ($(BR2_PACKAGE_CRACKLIB_FULL_DICT),y)
-CRACKLIB_EXTRA_DOWNLOADS = cracklib-words-$(CRACKLIB_VERSION).gz
-CRACKLIB_DICT_SOURCE = $(CRACKLIB_DL_DIR)/cracklib-words-$(CRACKLIB_VERSION).gz
+CRACKLIB_EXTRA_DOWNLOADS = cracklib-words-$(CRACKLIB_VERSION).bz2
+CRACKLIB_DICT_SOURCE = $(CRACKLIB_DL_DIR)/cracklib-words-$(CRACKLIB_VERSION).bz2
 else
 CRACKLIB_DICT_SOURCE = $(@D)/dicts/cracklib-small
 endif