Attachment 207294 Details for Bug 240420 – Patch for misc/findutils to update to 4.7.0

[patch] Patch for misc/findutils to update to 4.7.0

findutils.diff (text/plain), 3.73 KB, created by Klaus Aehlig on 2019-09-08 16:36:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2019-09-08 16:36:16 UTC

Size: 3.73 KB

patch

obsolete

>diff -ruN findutils.orig/Makefile findutils/Makefile
>--- findutils.orig/Makefile	2019-09-08 18:26:18.549649000 +0200
>+++ findutils/Makefile	2019-09-08 18:30:27.430629000 +0200
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/misc/findutils/Makefile 484628 2018-11-10 18:12:57Z bapt $
> 
> PORTNAME=	findutils
>-PORTVERSION=	4.6.0
>-PORTREVISION=	1
>+PORTVERSION=	4.7.0
> CATEGORIES=	misc
> MASTER_SITES=	GNU
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
>@@ -15,7 +14,7 @@
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES+=		charsetfix cpe gmake
>+USES+=		charsetfix cpe gmake tar:xz
> SIG_FILES=	${DISTNAME}${EXTRACT_SUFX}.sig
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>diff -ruN findutils.orig/distinfo findutils/distinfo
>--- findutils.orig/distinfo	2019-09-08 18:26:18.549578000 +0200
>+++ findutils/distinfo	2019-09-08 18:30:27.430511000 +0200
>@@ -1,4 +1,5 @@
>-SHA256 (findutils-4.6.0.tar.gz) = ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
>-SIZE (findutils-4.6.0.tar.gz) = 3780154
>-SHA256 (findutils-4.6.0.tar.gz.sig) = d6a77e6889f31571eb2f0446ac4d1cc16acbaf684f5e5d4e0feb88f2cc1d5b52
>-SIZE (findutils-4.6.0.tar.gz.sig) = 152
>+TIMESTAMP = 1567957854
>+SHA256 (findutils-4.7.0.tar.xz) = c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a
>+SIZE (findutils-4.7.0.tar.xz) = 1895048
>+SHA256 (findutils-4.7.0.tar.xz.sig) = 2f620e6d941e241fac52344a89149ab1ffeefb0fb9e42174e17a508d59a31d0f
>+SIZE (findutils-4.7.0.tar.xz.sig) = 488
>diff -ruN findutils.orig/files/patch-locate__updatedb.sh findutils/files/patch-locate__updatedb.sh
>--- findutils.orig/files/patch-locate__updatedb.sh	2019-09-08 18:26:18.549521000 +0200
>+++ findutils/files/patch-locate__updatedb.sh	2019-09-08 18:30:27.430416000 +0200
>@@ -1,6 +1,6 @@
>---- locate/updatedb.sh.orig	2011-04-03 23:53:12.000000000 +0100
>-+++ locate/updatedb.sh	2011-05-17 18:20:29.000000000 +0100
>-@@ -250,7 +250,7 @@
>+--- locate/updatedb.sh.orig	2019-06-23 09:00:40 UTC
>++++ locate/updatedb.sh
>+@@ -292,7 +292,7 @@ cd "$changeto"
>  if test -n "$SEARCHPATHS"; then
>    if [ "$LOCALUSER" != "" ]; then
>      # : A1
>@@ -9,7 +9,7 @@
>      "$find $SEARCHPATHS $FINDOPTIONS \
>       \$ $prunefs_exp \
>       -type d -regex '$PRUNEREGEX' \$ -prune -o $print_option"
>-@@ -266,7 +266,7 @@
>+@@ -308,7 +308,7 @@ if test -n "$NETPATHS"; then
>  myuid=`getuid`
>  if [ "$myuid" = 0 ]; then
>      # : A3
>@@ -18,21 +18,3 @@
>       "$find $NETPATHS $FINDOPTIONS \$ -type d -regex '$PRUNEREGEX' -prune \$ -o $print_option" ||
>      exit $?
>    else
>-@@ -319,7 +319,7 @@
>- if test -n "$SEARCHPATHS"; then
>-   if [ "$LOCALUSER" != "" ]; then
>-     # : A5
>--    su $LOCALUSER `select_shell $LOCALUSER` -c \
>-+    su -m $LOCALUSER -c \
>-     "$find $SEARCHPATHS $FINDOPTIONS \
>-      $ $prunefs_exp \
>-      -type d -regex '$PRUNEREGEX' $ -prune -o $print_option" || exit $?
>-@@ -335,7 +335,7 @@
>-   myuid=`getuid`
>-   if [ "$myuid" = 0 ]; then
>-     # : A7
>--    su $NETUSER `select_shell $NETUSER` -c \
>-+    su -m $NETUSER -c \
>-      "$find $NETPATHS $FINDOPTIONS \$ -type d -regex '$PRUNEREGEX' -prune \$ -o $print_option" ||
>-     exit $?
>-   else
>diff -ruN findutils.orig/pkg-plist findutils/pkg-plist
>--- findutils.orig/pkg-plist	2019-09-08 18:26:18.549605000 +0200
>+++ findutils/pkg-plist	2019-09-08 18:30:27.430558000 +0200
>@@ -2,8 +2,6 @@
> bin/glocate
> bin/gupdatedb
> bin/gxargs
>-libexec/gbigram
>-libexec/gcode
> libexec/gfrcode
> man/man1/gfind.1.gz
> man/man1/glocate.1.gz
>@@ -40,7 +38,6 @@
> %%NLS%%share/locale/pt_BR/LC_MESSAGES/findutils.mo
> %%NLS%%share/locale/ro/LC_MESSAGES/findutils.mo
> %%NLS%%share/locale/ru/LC_MESSAGES/findutils.mo
>-%%NLS%%share/locale/rw/LC_MESSAGES/findutils.mo
> %%NLS%%share/locale/sk/LC_MESSAGES/findutils.mo
> %%NLS%%share/locale/sl/LC_MESSAGES/findutils.mo
> %%NLS%%share/locale/sr/LC_MESSAGES/findutils.mo

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 240420: 207294