file: update to 6.41
authorRosen Penev <rosenp@gmail.com>
Tue, 7 Dec 2021 06:10:52 +0000 (22:10 -0800)
committerRosen Penev <rosenp@gmail.com>
Thu, 16 Dec 2021 23:27:05 +0000 (15:27 -0800)
Remove upstreamed patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
libs/file/Makefile
libs/file/patches/100-magic-remove-u-from-pattern.patch [deleted file]

index 2b0eac4075a26fff559eee71876ddf237ef28586..bc8685a6fbab1a84701ad0fa30c121e7b5805932 100644 (file)
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=file
-PKG_VERSION:=5.40
+PKG_VERSION:=5.41
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.openpkg.org/components/cache/file/ \
        ftp://ftp.astron.com/pub/file/
-PKG_HASH:=167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57
+PKG_HASH:=13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f
 
 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 PKG_LICENSE:=BSD-2-Clause
diff --git a/libs/file/patches/100-magic-remove-u-from-pattern.patch b/libs/file/patches/100-magic-remove-u-from-pattern.patch
deleted file mode 100644 (file)
index a69e65f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6b34436ac766dae64749b8d14f18c6910be40131 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 5 Apr 2021 16:36:14 +0000
-Subject: [PATCH] remove "u" from the pattern (Joerg Jenderek)
-
----
- magic/Magdir/mail.news | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/magic/Magdir/mail.news
-+++ b/magic/Magdir/mail.news
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------------
--# $File: mail.news,v 1.26 2021/03/21 14:37:03 christos Exp $
-+# $File: mail.news,v 1.27 2021/04/05 16:36:14 christos Exp $
- # mail.news:  file(1) magic for mail and news
- #
- # Unfortunately, saved netnews also has From line added in some news software.
-@@ -81,4 +81,4 @@
- # File format spec: https://wiki.dovecot.org/Design/Dcrypt/#File_format
- # From: Stephen Gildea
- 0     string  CRYPTED\003\007         Dovecot encrypted message
-->9    byte    xu                      \b, dcrypt version %d
-+>9    byte    x                       \b, dcrypt version %d