Attachment 214154 Details for Bug 246183 – linux_base-c7 patch

[patch] linux_base-c7 patch

linux_base-c7.patch (text/plain), 7.13 KB, created by Tijl Coosemans on 2020-05-05 12:16:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2020-05-05 12:16:22 UTC

Size: 7.13 KB

patch

obsolete

>Index: emulators/linux_base-c7/Makefile
>===================================================================
>--- emulators/linux_base-c7/Makefile	(revision 533773)
>+++ emulators/linux_base-c7/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	c7
> PORTVERSION=	${LINUX_DIST_VER}
>+PORTREVISION=	1
> CATEGORIES=	emulators linux
> PKGNAMEPREFIX=	linux_base-
> EXTRACT_ONLY=	${DISTFILES:N*${SRC_SUFX}*:Nfilesystem-*:C/:[^:]+$//}
>@@ -22,7 +23,7 @@ BIN_DISTNAMES=	bash-4.2.46-34.el7 \
> 		filesystem-3.2-25.el7 \
> 		findutils-4.5.11-6.el7 \
> 		gawk-4.0.2-4.el7_3.1 \
>-		glibc-common-2.17-307.el7.1 \
>+		glibc-common-${GLIBC_VER} \
> 		grep-2.20-3.el7 \
> 		info-5.1-5.el7 \
> 		keyutils-1.5.8-3.el7 \
>@@ -38,7 +39,7 @@ LIB_DISTNAMES=	bzip2-libs-1.0.6-13.el7 \
> 		gamin-0.1.10-16.el7 \
> 		gdbm-1.10-8.el7 \
> 		glib2-2.56.1-5.el7 \
>-		glibc-2.17-307.el7.1 \
>+		glibc-${GLIBC_VER} \
> 		gmp-6.0.0-15.el7 \
> 		keyutils-libs-1.5.8-3.el7 \
> 		krb5-libs-1.15.1-46.el7 \
>@@ -88,7 +89,7 @@ SRC_DISTFILES=	acl-2.2.51-15.el7${SRC_SUFX}:SOURCE \
> 		gcc-4.8.5-39.el7${SRC_SUFX}:SOURCE \
> 		gdbm-1.10-8.el7${SRC_SUFX}:SOURCE \
> 		glib2-2.56.1-5.el7${SRC_SUFX}:SOURCE \
>-		glibc-2.17-307.el7.1${SRC_SUFX}:SOURCE \
>+		glibc-${GLIBC_VER}${SRC_SUFX}:SOURCE \
> 		gmp-6.0.0-15.el7${SRC_SUFX}:SOURCE \
> 		grep-2.20-3.el7${SRC_SUFX}:SOURCE \
> 		keyutils-1.5.8-3.el7${SRC_SUFX}:SOURCE \
>@@ -131,8 +132,22 @@ REMOVE_FILES=	bin/chfn bin/chsh bin/findmnt bin/login 
> 		etc/passwd etc/printcap etc/protocols etc/services etc/shadow \
> 		sbin/clock sbin/debugfs sbin/hwclock sbin/runuser sbin/zramctl
> 
>-.include <bsd.port.options.mk>
>+.include <bsd.port.pre.mk>
> 
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300077
>+GLIBC_VER=	2.17-292.el7
>+MASTER_SITE_SUBDIR+=	centos/7.7.1908/os/x86_64/Packages/:DEFAULT,amd64 \
>+			centos/7.7.1908/updates/x86_64/Packages/:DEFAULT,amd64 \
>+			altarch/7.7.1908/os/i386/Packages/:DEFAULT,i386 \
>+			altarch/7.7.1908/updates/i386/Packages/:DEFAULT,i386 \
>+			centos/7.7.1908/os/Source/SPackages/:SOURCE \
>+			centos/7.7.1908/updates/Source/SPackages/:SOURCE
>+PLIST_SUB+=	NEWGLIBC="@comment "
>+.else
>+GLIBC_VER=	2.17-307.el7.1
>+PLIST_SUB+=	NEWGLIBC=""
>+.endif
>+
> .if ${ARCH} == amd64
> SYSCTLMIB=	kern.features.linux64
> .else
>@@ -177,4 +192,4 @@ post-install:
> 	${LN} -sf /var/run ${STAGEDIR}${PREFIX}/run
> 	${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: emulators/linux_base-c7/distinfo
>===================================================================
>--- emulators/linux_base-c7/distinfo	(revision 533773)
>+++ emulators/linux_base-c7/distinfo	(working copy)
>@@ -1,4 +1,4 @@
>-TIMESTAMP = 1588504000
>+TIMESTAMP = 1588679657
> SHA256 (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 0280ee16df09be0cebf62695706598caed8ff5cba47de1fed625068a90a9ef68
> SIZE (centos/basesystem-10.0-7.el7.centos.noarch.rpm) = 5124
> SHA256 (centos/bash-4.2.46-34.el7.i686.rpm) = 21937537a4ae700313a3ef46e85f9e396087b58eec02ae8dfcfc494994d9d43b
>@@ -65,10 +65,18 @@ SHA256 (centos/glib2-2.56.1-5.el7.i686.rpm) = 579982c4
> SIZE (centos/glib2-2.56.1-5.el7.i686.rpm) = 2554256
> SHA256 (centos/glib2-2.56.1-5.el7.x86_64.rpm) = 8d3643f5aede8965ac18fb5682f4b110a727a2ac69ad3923cdd5d61ca430948a
> SIZE (centos/glib2-2.56.1-5.el7.x86_64.rpm) = 2571348
>+SHA256 (centos/glibc-2.17-292.el7.i686.rpm) = 4937ab14ee92f677f31d7fffee31e6925ee2363e337b6aa3cef9d7c20bc95c5e
>+SIZE (centos/glibc-2.17-292.el7.i686.rpm) = 4462180
>+SHA256 (centos/glibc-2.17-292.el7.x86_64.rpm) = 39bf574a1b3f487b27394da02dfc077a55c2d61be9cb28a0444c32a2c0fb8883
>+SIZE (centos/glibc-2.17-292.el7.x86_64.rpm) = 3810256
> SHA256 (centos/glibc-2.17-307.el7.1.i686.rpm) = 2ff803f22017ecc6c43e8415915e0f7ef83d06504137e1d9ad41255db4ca7fed
> SIZE (centos/glibc-2.17-307.el7.1.i686.rpm) = 4463036
> SHA256 (centos/glibc-2.17-307.el7.1.x86_64.rpm) = 247b58681972da7ddfa7ba2ae2e5b3a3fe4399acd12f756c157547a97eb323b9
> SIZE (centos/glibc-2.17-307.el7.1.x86_64.rpm) = 3815032
>+SHA256 (centos/glibc-common-2.17-292.el7.i686.rpm) = 34ace9f901a58eb620615668e94679b636d702393eb28a1fe1d1b975324edbcb
>+SIZE (centos/glibc-common-2.17-292.el7.i686.rpm) = 12032288
>+SHA256 (centos/glibc-common-2.17-292.el7.x86_64.rpm) = ebb877c2140c0513f11b9e26fe3303d4da24822ba33245d5eb376c66a6333d34
>+SIZE (centos/glibc-common-2.17-292.el7.x86_64.rpm) = 12052540
> SHA256 (centos/glibc-common-2.17-307.el7.1.i686.rpm) = 45c0a0ab38bd4943045f1af45f5bfe6b87d75d9c1e2860cdc8f9912d098b30ff
> SIZE (centos/glibc-common-2.17-307.el7.1.i686.rpm) = 12038908
> SHA256 (centos/glibc-common-2.17-307.el7.1.x86_64.rpm) = fa6f445d704de3eb0ec01107f30bbdcbc3a7a480e72e428e34760c8c2d0de8a0
>@@ -257,6 +265,8 @@ SHA256 (centos/gdbm-1.10-8.el7.src.rpm) = 0cbcec29b9a0
> SIZE (centos/gdbm-1.10-8.el7.src.rpm) = 683693
> SHA256 (centos/glib2-2.56.1-5.el7.src.rpm) = 6754a3a9cff1ecf6fa1fb181501005ff20f6fa7fde6294d6c536ac8a2ee52c73
> SIZE (centos/glib2-2.56.1-5.el7.src.rpm) = 8058037
>+SHA256 (centos/glibc-2.17-292.el7.src.rpm) = c8f988796cbbe97d2927461bd122f1256cb9b20e3d902d26739af7db4e354ff4
>+SIZE (centos/glibc-2.17-292.el7.src.rpm) = 26359150
> SHA256 (centos/glibc-2.17-307.el7.1.src.rpm) = c464c9cacc4f2a78ce289f99f079a0832ad91ac6795a6dd22272616c426c8b0e
> SIZE (centos/glibc-2.17-307.el7.1.src.rpm) = 26400896
> SHA256 (centos/gmp-6.0.0-15.el7.src.rpm) = 340edc06c625434ab544b26a0bec6789a299242d09b12bedb6d555a710926c6b
>Index: emulators/linux_base-c7/pkg-plist.amd64
>===================================================================
>--- emulators/linux_base-c7/pkg-plist.amd64	(revision 533773)
>+++ emulators/linux_base-c7/pkg-plist.amd64	(working copy)
>@@ -486,7 +486,7 @@ usr/lib/gconv/IBM852.so
> usr/lib/gconv/IBM855.so
> usr/lib/gconv/IBM856.so
> usr/lib/gconv/IBM857.so
>-usr/lib/gconv/IBM858.so
>+%%NEWGLIBC%%usr/lib/gconv/IBM858.so
> usr/lib/gconv/IBM860.so
> usr/lib/gconv/IBM861.so
> usr/lib/gconv/IBM862.so
>@@ -969,7 +969,7 @@ usr/lib64/gconv/IBM852.so
> usr/lib64/gconv/IBM855.so
> usr/lib64/gconv/IBM856.so
> usr/lib64/gconv/IBM857.so
>-usr/lib64/gconv/IBM858.so
>+%%NEWGLIBC%%usr/lib64/gconv/IBM858.so
> usr/lib64/gconv/IBM860.so
> usr/lib64/gconv/IBM861.so
> usr/lib64/gconv/IBM862.so
>@@ -1806,7 +1806,7 @@ usr/share/i18n/charmaps/IBM852.gz
> usr/share/i18n/charmaps/IBM855.gz
> usr/share/i18n/charmaps/IBM856.gz
> usr/share/i18n/charmaps/IBM857.gz
>-usr/share/i18n/charmaps/IBM858.gz
>+%%NEWGLIBC%%usr/share/i18n/charmaps/IBM858.gz
> usr/share/i18n/charmaps/IBM860.gz
> usr/share/i18n/charmaps/IBM861.gz
> usr/share/i18n/charmaps/IBM862.gz
>Index: emulators/linux_base-c7/pkg-plist.i386
>===================================================================
>--- emulators/linux_base-c7/pkg-plist.i386	(revision 533773)
>+++ emulators/linux_base-c7/pkg-plist.i386	(working copy)
>@@ -482,7 +482,7 @@ usr/lib/gconv/IBM852.so
> usr/lib/gconv/IBM855.so
> usr/lib/gconv/IBM856.so
> usr/lib/gconv/IBM857.so
>-usr/lib/gconv/IBM858.so
>+%%NEWGLIBC%%usr/lib/gconv/IBM858.so
> usr/lib/gconv/IBM860.so
> usr/lib/gconv/IBM861.so
> usr/lib/gconv/IBM862.so
>@@ -1339,7 +1339,7 @@ usr/share/i18n/charmaps/IBM852.gz
> usr/share/i18n/charmaps/IBM855.gz
> usr/share/i18n/charmaps/IBM856.gz
> usr/share/i18n/charmaps/IBM857.gz
>-usr/share/i18n/charmaps/IBM858.gz
>+%%NEWGLIBC%%usr/share/i18n/charmaps/IBM858.gz
> usr/share/i18n/charmaps/IBM860.gz
> usr/share/i18n/charmaps/IBM861.gz
> usr/share/i18n/charmaps/IBM862.gz

Actions: View | Diff

Attachments on bug 246183: 214154