Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1601835343130110"
MIME-Version: 1.0
Date: Sun, 4 Oct 2020 18:15:43 +0000
From: "Jonathan Schleifer" <js@netbsd.org>
Subject: CVS commit: pkgsrc/sysutils/py-magic
To: pkgsrc-changes@NetBSD.org
Reply-To: js@netbsd.org
Message-Id: <20201004181543.6995EFB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1601835343130110
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	js
Date:		Sun Oct  4 18:15:43 UTC 2020

Modified Files:
	pkgsrc/sysutils/py-magic: Makefile distinfo
Added Files:
	pkgsrc/sysutils/py-magic/patches: patch-magic.py

Log Message:
Make sysutils/py-magic work in a chroot on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/py-magic/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/py-magic/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/py-magic/patches/patch-magic.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1601835343130110
Content-Disposition: inline
Content-Length: 2500
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/sysutils/py-magic/Makefile
diff -u pkgsrc/sysutils/py-magic/Makefile:1.8 pkgsrc/sysutils/py-magic/Makefile:1.9
--- pkgsrc/sysutils/py-magic/Makefile:1.8	Fri May  8 13:57:19 2020
+++ pkgsrc/sysutils/py-magic/Makefile	Sun Oct  4 18:15:43 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2020/05/08 13:57:19 adam Exp $
+# $NetBSD: Makefile,v 1.9 2020/10/04 18:15:43 js Exp $
 
 DISTNAME=	python-magic-0.4.18
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/1}
+PKGREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/python-magic/}
 

Index: pkgsrc/sysutils/py-magic/distinfo
diff -u pkgsrc/sysutils/py-magic/distinfo:1.5 pkgsrc/sysutils/py-magic/distinfo:1.6
--- pkgsrc/sysutils/py-magic/distinfo:1.5	Fri May  8 13:57:19 2020
+++ pkgsrc/sysutils/py-magic/distinfo	Sun Oct  4 18:15:43 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2020/05/08 13:57:19 adam Exp $
+$NetBSD: distinfo,v 1.6 2020/10/04 18:15:43 js Exp $
 
 SHA1 (python-magic-0.4.18.tar.gz) = b48c84ef096baaf10b4f7cb3792ef8328c946c81
 RMD160 (python-magic-0.4.18.tar.gz) = 54bd572566e60eec7e8b2652ecc6d287ff300d56
 SHA512 (python-magic-0.4.18.tar.gz) = 18c4d75bc762d44f42c44bb52b999930ea570d2dd11d7cb840807e372806dc14164e1b3ea0acb23ccd692177a1a683d4537b01675bc57f06334bcc0f40520e6c
 Size (python-magic-0.4.18.tar.gz) = 11442 bytes
+SHA1 (patch-magic.py) = 54dd70103feb8278601f7dc00731a4f2c6e25f1d

Added files:

Index: pkgsrc/sysutils/py-magic/patches/patch-magic.py
diff -u /dev/null pkgsrc/sysutils/py-magic/patches/patch-magic.py:1.1
--- /dev/null	Sun Oct  4 18:15:43 2020
+++ pkgsrc/sysutils/py-magic/patches/patch-magic.py	Sun Oct  4 18:15:43 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-magic.py,v 1.1 2020/10/04 18:15:43 js Exp $
+
+--- magic.py.orig	2020-05-06 02:14:40.000000000 +0000
++++ magic.py
+@@ -187,8 +187,10 @@ if not libmagic or not libmagic._name:
+                        'win32': windows_dlls,
+                        'cygwin': windows_dlls,
+                        'linux': ['libmagic.so.1'],  # fallback for some Linuxes (e.g. Alpine) where library search does not work # flake8:noqa
++                       'netbsd': ['libmagic.so.6.0'],  # fallback for running in chroot
+                       }
+     platform = 'linux' if sys.platform.startswith('linux') else sys.platform
++    platform = 'netbsd' if sys.platform.startswith('netbsd') else sys.platform
+     for dll in platform_to_lib.get(platform, []):
+         try:
+             libmagic = ctypes.CDLL(dll)


--_----------=_1601835343130110--