From 65749575ab7a6f4c68c37a5d14cbbe6c6b07f299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 19 Jun 2021 10:03:21 +0700 Subject: [PATCH] srcpkgs/n*: convert patches to -Np1 ```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,\(^--- \)\(./\)*,\1a/, s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1, s/[.-][Oo][Rr][Ii][Gg]$// s/[.]patched[.]\([^.]\)/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,\(^+++ \)\(./\)*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ``` --- .../nagstamon/patches/disable-kerberos.patch | 12 +++++------ srcpkgs/nagstamon/template | 1 - srcpkgs/namecoin/patches/dequeu.patch | 4 ++-- srcpkgs/namecoin/template | 1 - srcpkgs/navit/patches/QPainterPath.patch | 4 ++-- srcpkgs/navit/template | 1 - srcpkgs/nemiver/patches/bool-conversion.patch | 4 ++-- srcpkgs/nemiver/patches/fix-nullptr.patch | 8 ++++---- srcpkgs/nemiver/template | 1 - srcpkgs/net-snmp/patches/fix-includes.patch | 4 ++-- .../patches/netsnmp-swinst-crash.patch | 4 ++-- srcpkgs/net-snmp/template | 1 - .../netcat-0.7.1-signed-bit-counting.patch | 4 ++-- srcpkgs/netcat/template | 1 - srcpkgs/nethack/patches/1-linux-hints.patch | 4 ++-- srcpkgs/nethack/template | 1 - srcpkgs/netpgp/patches/configure.ac.patch | 4 ++-- srcpkgs/netpgp/patches/lib_keyring_c.patch | 4 ++-- .../patches/lib_openssl__crypto.c.patch | 4 ++-- srcpkgs/netpgp/patches/lib_reader_c.patch | 4 ++-- srcpkgs/netpgp/patches/lib_signature_c.patch | 4 ++-- srcpkgs/netpgp/patches/netpgp_1.patch | 4 ++-- srcpkgs/netpgp/template | 1 - srcpkgs/netpgpverify/patches/install.patch | 4 ++-- srcpkgs/netpgpverify/template | 1 - .../nettle/patches/musl-ppc-use-auxval.patch | 4 ++-- srcpkgs/nettle/patches/ppc64-elfv2.patch | 4 ++-- srcpkgs/nettle/template | 1 - .../patches/openssl-1.1.patch | 20 +++++++++---------- srcpkgs/network-ups-tools/template | 1 - srcpkgs/newlisp/patches/build-fixes.patch | 8 ++++---- .../newlisp-makefile-install-10.7.0.patch | 4 ++-- srcpkgs/newlisp/template | 1 - .../patches/fallback-primary-screen.patch | 4 ++-- ...ariadic-macro-warning-only-for-clang.patch | 4 ++-- .../patches/testfolderman-within-chroot.patch | 4 ++-- srcpkgs/nextcloud-client/template | 1 - srcpkgs/nfs4-acl-tools/patches/Makefile.patch | 4 ++-- srcpkgs/nfs4-acl-tools/template | 1 - .../fix-libressl-stapling-issues.patch | 4 ++-- srcpkgs/nginx/template | 1 - srcpkgs/ngspice/patches/windows-only.patch | 4 ++-- srcpkgs/ngspice/template | 1 - .../patches/fix-build-with-qt-5-11.patch | 4 ++-- srcpkgs/nitroshare/template | 1 - srcpkgs/nm-tray/patches/ftbfs.patch | 4 ++-- srcpkgs/nm-tray/template | 1 - srcpkgs/nmon/patches/musl-fixes.patch | 4 ++-- srcpkgs/nmon/template | 1 - srcpkgs/nocache/patches/musl.patch | 4 ++-- srcpkgs/nocache/template | 1 - srcpkgs/nodejs-lts-10/patches/atomic8.patch | 4 ++-- srcpkgs/nodejs-lts-10/patches/ppc32.patch | 8 ++++---- srcpkgs/nodejs-lts-10/patches/ppc64.patch | 4 ++-- srcpkgs/nodejs-lts-10/template | 1 - srcpkgs/nodejs-lts/patches/ppc32.patch | 4 ++-- srcpkgs/nodejs-lts/patches/shared-uv.patch | 4 ++-- srcpkgs/nodejs-lts/template | 1 - srcpkgs/nodejs/patches/ppc32.patch | 4 ++-- srcpkgs/nodejs/patches/shared-uv.patch | 4 ++-- srcpkgs/nodejs/template | 1 - srcpkgs/noip2/patches/01-foreground.patch | 4 ++-- srcpkgs/noip2/patches/02-fix_foreground.patch | 4 ++-- srcpkgs/noip2/patches/03-prefix.patch | 4 ++-- srcpkgs/noip2/template | 1 - srcpkgs/nootka/patches/signed-char.patch | 8 ++++---- srcpkgs/nootka/template | 1 - srcpkgs/notepadqq/patches/disable-stats.patch | 4 ++-- srcpkgs/notepadqq/template | 1 - srcpkgs/notes-up/patches/vala-0.50.patch | 4 ++-- srcpkgs/notes-up/template | 1 - .../nrpe/patches/nrpe-4.0.2-libressl.patch | 8 ++++---- srcpkgs/nrpe/template | 1 - srcpkgs/nsjail/patches/kafel-bison.patch | 4 ++-- srcpkgs/nsjail/template | 1 - srcpkgs/nspr/patches/mips-sgidefs_h.patch | 4 ++-- .../patches/ppc64-default-stack-size.diff | 4 ++-- srcpkgs/nspr/template | 1 - ...d26354548fc3f883a56e8bfafc78f5265ce8.patch | 4 ++-- ...7b7cb5133302087980ef321a83670d383db1.patch | 4 ++-- srcpkgs/nss/template | 1 - srcpkgs/ntp/patches/fix_build.diff | 4 ++-- srcpkgs/ntp/template | 1 - srcpkgs/numactl/patches/hardening.patch | 4 ++-- srcpkgs/numactl/patches/musl.patch | 4 ++-- srcpkgs/numactl/template | 1 - srcpkgs/nvme-cli/patches/dracut-warning.patch | 4 ++-- srcpkgs/nvme-cli/template | 1 - .../nwipe/patches/0001-musl-build-fix.patch | 4 ++-- srcpkgs/nwipe/template | 1 - .../patches/fix-musl-headers-x86.patch | 4 ++-- srcpkgs/nx-libs/patches/xf86bigfont.patch | 4 ++-- srcpkgs/nx-libs/template | 1 - 93 files changed, 136 insertions(+), 172 deletions(-) diff --git a/srcpkgs/nagstamon/patches/disable-kerberos.patch b/srcpkgs/nagstamon/patches/disable-kerberos.patch index deacba86517..97b7359bf61 100644 --- a/srcpkgs/nagstamon/patches/disable-kerberos.patch +++ b/srcpkgs/nagstamon/patches/disable-kerberos.patch @@ -1,6 +1,6 @@ diff -ur Nagstamon.orig/Nagstamon/QUI/__init__.py Nagstamon/Nagstamon/QUI/__init__.py ---- Nagstamon/QUI/__init__.py 2020-01-24 10:12:12.000000000 -0500 -+++ Nagstamon/QUI/__init__.py 2020-10-08 00:20:39.437758862 -0400 +--- a/Nagstamon/QUI/__init__.py 2020-01-24 10:12:12.000000000 -0500 ++++ b/Nagstamon/QUI/__init__.py 2020-10-08 00:20:39.437758862 -0400 @@ -5770,7 +5770,7 @@ self.ui.button_choose_custom_cert_ca_file.clicked.connect(self.choose_custom_cert_ca_file) @@ -11,8 +11,8 @@ diff -ur Nagstamon.orig/Nagstamon/QUI/__init__.py Nagstamon/Nagstamon/QUI/__init # detect change of server type which leads to certain options shown or hidden self.ui.input_combobox_type.activated.connect(self.toggle_type) diff -ur Nagstamon.orig/Nagstamon/Servers/Generic.py Nagstamon/Nagstamon/Servers/Generic.py ---- Nagstamon/Servers/Generic.py 2020-01-24 10:12:12.000000000 -0500 -+++ Nagstamon/Servers/Generic.py 2020-10-08 00:21:28.460699656 -0400 +--- a/Nagstamon/Servers/Generic.py 2020-01-24 10:12:12.000000000 -0500 ++++ b/Nagstamon/Servers/Generic.py 2020-10-08 00:21:28.460699656 -0400 @@ -53,15 +53,6 @@ RESOURCES) @@ -39,8 +39,8 @@ diff -ur Nagstamon.orig/Nagstamon/Servers/Generic.py Nagstamon/Nagstamon/Servers # default to check TLS validity if self.ignore_cert: diff -ur Nagstamon.orig/setup.py Nagstamon/setup.py ---- setup.py 2020-10-08 00:18:37.532906083 -0400 -+++ setup.py 2020-10-08 00:21:43.580681397 -0400 +--- a/setup.py 2020-10-08 00:18:37.532906083 -0400 ++++ b/setup.py 2020-10-08 00:21:43.580681397 -0400 @@ -89,7 +89,6 @@ 'python3-psutil ' 'python3-qt5 ' diff --git a/srcpkgs/nagstamon/template b/srcpkgs/nagstamon/template index 50e74fb4a47..a3e92bfa761 100644 --- a/srcpkgs/nagstamon/template +++ b/srcpkgs/nagstamon/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="https://nagstamon.ifw-dresden.de" distfiles="https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz" checksum=7a9611f40b08269bba4100ab2598ee089c7d0ebc6c4e9d7132689342f71150ec -patch_args=-Np0 post_patch() { # This relies on /etc/os-release, which doesn't exist without diff --git a/srcpkgs/namecoin/patches/dequeu.patch b/srcpkgs/namecoin/patches/dequeu.patch index a9053422eaa..60aa9511a3f 100644 --- a/srcpkgs/namecoin/patches/dequeu.patch +++ b/srcpkgs/namecoin/patches/dequeu.patch @@ -1,5 +1,5 @@ ---- src/httpserver.cpp 2019-08-05 07:23:46.000000000 +0200 -+++ - 2020-01-10 23:11:38.529089780 +0100 +--- a/src/httpserver.cpp 2019-08-05 07:23:46.000000000 +0200 ++++ b/src/httpserver.cpp 2019-08-05 07:23:46.000000000 +0200 @@ -18,6 +18,7 @@ #include #include diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template index 991026db606..e4cfb3777b7 100644 --- a/srcpkgs/namecoin/template +++ b/srcpkgs/namecoin/template @@ -15,7 +15,6 @@ license="MIT" homepage="https://namecoin.org" distfiles="https://github.com/namecoin/namecoin-core/archive/nc${version}.tar.gz" checksum=7117a0a0b8f48d49e4abf3577660f8a4eb9a4dea753281d19d9470725fc75d8e -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/navit/patches/QPainterPath.patch b/srcpkgs/navit/patches/QPainterPath.patch index e67b9bd8c16..5e3b5be7022 100644 --- a/srcpkgs/navit/patches/QPainterPath.patch +++ b/srcpkgs/navit/patches/QPainterPath.patch @@ -1,5 +1,5 @@ ---- navit/graphics/qt5/graphics_qt5.cpp 2020-01-19 00:36:55.000000000 +0100 -+++ navit/graphics/qt5/graphics_qt5.cpp 2020-09-02 14:53:01.762542347 +0200 +--- a/navit/graphics/qt5/graphics_qt5.cpp 2020-01-19 00:36:55.000000000 +0100 ++++ b/navit/graphics/qt5/graphics_qt5.cpp 2020-09-02 14:53:01.762542347 +0200 @@ -45,6 +45,7 @@ #include #include diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template index 4ae5fbeaf5e..449ef1ca16d 100644 --- a/srcpkgs/navit/template +++ b/srcpkgs/navit/template @@ -16,7 +16,6 @@ license="GPL-2.0-only, LGPL-2.0-only" homepage="http://www.navit-project.org/" distfiles="https://github.com/navit-gps/navit/archive/v${version}.tar.gz" checksum=728d9dcad00e97769f6cd85bfad5518b0edf62ef75d60543fa4c48c1c3ab1243 -patch_args=-Np0 pre_configure() { sed -i -e 's/\(GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR}\) NAME/\1 DIRECTORY/' CMakeLists.txt diff --git a/srcpkgs/nemiver/patches/bool-conversion.patch b/srcpkgs/nemiver/patches/bool-conversion.patch index e865d2a22e0..9495f8e894d 100644 --- a/srcpkgs/nemiver/patches/bool-conversion.patch +++ b/srcpkgs/nemiver/patches/bool-conversion.patch @@ -10,8 +10,8 @@ Subject: Fix compiliation warnings & errors diff --git a/src/dbgengine/nmv-dbg-common.h b/src/dbgengine/nmv-dbg-common.h index ad3cc00..0edac7c 100644 ---- ./src/dbgengine/nmv-dbg-common.h -+++ ./src/dbgengine/nmv-dbg-common.h +--- a/src/dbgengine/nmv-dbg-common.h ++++ b/src/dbgengine/nmv-dbg-common.h @@ -171,7 +171,7 @@ public: bool has_slot () const diff --git a/srcpkgs/nemiver/patches/fix-nullptr.patch b/srcpkgs/nemiver/patches/fix-nullptr.patch index 81d855ee67d..a6ac803a5e4 100644 --- a/srcpkgs/nemiver/patches/fix-nullptr.patch +++ b/srcpkgs/nemiver/patches/fix-nullptr.patch @@ -1,6 +1,6 @@ ---- ./src/persp/dbgperspective/nmv-dbg-perspective.cc.orig 2017-09-20 16:02:08.953676793 +0200 -+++ ./src/persp/dbgperspective/nmv-dbg-perspective.cc 2017-09-20 16:02:36.863981316 +0200 +--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc 2017-09-20 16:02:08.953676793 +0200 ++++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc 2017-09-20 16:02:36.863981316 +0200 @@ -5720,7 +5720,7 @@ DBGPerspective::switch_to_source_code () Glib::RefPtr source_buf; @@ -10,8 +10,8 @@ // Woops! // We don't have any source code buffer. Let's try hard to get // the source code corresponding to the current frame. For that, ---- ./src/persp/dbgperspective/nmv-dbg-perspective.cc.orig 2017-09-20 15:24:58.771249130 +0200 -+++ ./src/persp/dbgperspective/nmv-dbg-perspective.cc 2017-09-20 15:25:04.202113802 +0200 +--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc 2017-09-20 15:24:58.771249130 +0200 ++++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc 2017-09-20 15:25:04.202113802 +0200 @@ -5672,7 +5672,7 @@ DBGPerspective::switch_to_asm (const com a_source_editor->clear_decorations (); diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template index 122758b9266..947ef8352a1 100644 --- a/srcpkgs/nemiver/template +++ b/srcpkgs/nemiver/template @@ -17,7 +17,6 @@ homepage="https://wiki.gnome.org/Apps/Nemiver" distfiles="https://download.gnome.org/sources/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2 lib32disabled=yes -patch_args=-Np0 pre_configure() { cp data/nemiver.appdata.xml data/nemiver.appdata.xml.in diff --git a/srcpkgs/net-snmp/patches/fix-includes.patch b/srcpkgs/net-snmp/patches/fix-includes.patch index d6f1cf28137..37e1da9c052 100644 --- a/srcpkgs/net-snmp/patches/fix-includes.patch +++ b/srcpkgs/net-snmp/patches/fix-includes.patch @@ -1,5 +1,5 @@ ---- agent/mibgroup/util_funcs/get_pid_from_inode.c.orig -+++ agent/mibgroup/util_funcs/get_pid_from_inode.c +--- a/agent/mibgroup/util_funcs/get_pid_from_inode.c ++++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c @@ -4,6 +4,7 @@ #include diff --git a/srcpkgs/net-snmp/patches/netsnmp-swinst-crash.patch b/srcpkgs/net-snmp/patches/netsnmp-swinst-crash.patch index 4f82ceed58f..dfbd55840f4 100644 --- a/srcpkgs/net-snmp/patches/netsnmp-swinst-crash.patch +++ b/srcpkgs/net-snmp/patches/netsnmp-swinst-crash.patch @@ -1,5 +1,5 @@ ---- agent/mibgroup/host/data_access/swinst_pkginfo.c.orig -+++ agent/mibgroup/host/data_access/swinst_pkginfo.c +--- a/agent/mibgroup/host/data_access/swinst_pkginfo.c ++++ b/agent/mibgroup/host/data_access/swinst_pkginfo.c @@ -207,7 +207,9 @@ memcpy( entry->swDate, cp, date_len ); entry->swDate_len = date_len; diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template index 6dad6b0f7cc..0b91683e00a 100644 --- a/srcpkgs/net-snmp/template +++ b/srcpkgs/net-snmp/template @@ -11,7 +11,6 @@ license="Net-SNMP" homepage="http://www.net-snmp.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f -patch_args=-Np0 LDFLAGS="-lpthread" diff --git a/srcpkgs/netcat/patches/netcat-0.7.1-signed-bit-counting.patch b/srcpkgs/netcat/patches/netcat-0.7.1-signed-bit-counting.patch index 5e86aa92d2f..e442407c7e8 100644 --- a/srcpkgs/netcat/patches/netcat-0.7.1-signed-bit-counting.patch +++ b/srcpkgs/netcat/patches/netcat-0.7.1-signed-bit-counting.patch @@ -4,8 +4,8 @@ # SF:1205729 "doen't work on arm linux platform": # http://sourceforge.net/tracker/?func=detail&aid=1068324&group_id=52204&atid=466046 ---- src/flagset.c 2010-07-19 13:51:46.000000000 +0100 -+++ src/flagset.c 2010-07-19 13:52:27.000000000 +0100 +--- a/src/flagset.c 2010-07-19 13:51:46.000000000 +0100 ++++ b/src/flagset.c 2010-07-19 13:52:27.000000000 +0100 @@ -134,7 +134,7 @@ int netcat_flag_count(void) diff --git a/srcpkgs/netcat/template b/srcpkgs/netcat/template index 2905db892d0..c588fc5ab7b 100644 --- a/srcpkgs/netcat/template +++ b/srcpkgs/netcat/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="http://netcat.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=30719c9a4ffbcf15676b8f528233ccc54ee6cba96cb4590975f5fd60c68a066f -patch_args=-Np0 alternatives=" nc:nc:/usr/bin/gnetcat diff --git a/srcpkgs/nethack/patches/1-linux-hints.patch b/srcpkgs/nethack/patches/1-linux-hints.patch index caaef540295..d97ff4aca8e 100644 --- a/srcpkgs/nethack/patches/1-linux-hints.patch +++ b/srcpkgs/nethack/patches/1-linux-hints.patch @@ -3,8 +3,8 @@ this file is intended to be editable by root. diff --git sys/unix/hints/linux sys/unix/hints/linux index 8629150..9a4d722 100644 ---- sys/unix/hints/linux -+++ sys/unix/hints/linux +--- a/sys/unix/hints/linux ++++ b/sys/unix/hints/linux @@ -23,7 +23,7 @@ POSTINSTALL=cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INS CFLAGS=-g -O -I../include -DNOTPARMDECL CFLAGS+=-DDLB diff --git a/srcpkgs/nethack/template b/srcpkgs/nethack/template index 65c414f3620..e39eafb0b5c 100644 --- a/srcpkgs/nethack/template +++ b/srcpkgs/nethack/template @@ -16,7 +16,6 @@ distfiles="https://www.nethack.org/download/${version}/nethack-${version//./}-sr checksum=cfde0c3ab6dd7c22ae82e1e5a59ab80152304eb23fb06e3129439271e5643ed2 nocross=yes system_accounts="$pkgname" -patch_args=-Np0 do_configure() { sh sys/unix/setup.sh sys/unix/hints/linux diff --git a/srcpkgs/netpgp/patches/configure.ac.patch b/srcpkgs/netpgp/patches/configure.ac.patch index 941545b115a..db4f066d7b3 100644 --- a/srcpkgs/netpgp/patches/configure.ac.patch +++ b/srcpkgs/netpgp/patches/configure.ac.patch @@ -1,7 +1,7 @@ automake-1.14 freaks out if AM_PROG_AR is not defined. ---- configure.ac.orig 2014-02-17 19:47:41.572637701 +0100 -+++ configure.ac 2014-02-17 19:47:54.604474781 +0100 +--- a/configure.ac 2014-02-17 19:47:41.572637701 +0100 ++++ b/configure.ac 2014-02-17 19:47:54.604474781 +0100 @@ -14,6 +14,7 @@ AC_CONFIG_HEADER([src/lib/config.h]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) diff --git a/srcpkgs/netpgp/patches/lib_keyring_c.patch b/srcpkgs/netpgp/patches/lib_keyring_c.patch index 8500d1f253c..aae01887225 100644 --- a/srcpkgs/netpgp/patches/lib_keyring_c.patch +++ b/srcpkgs/netpgp/patches/lib_keyring_c.patch @@ -4,8 +4,8 @@ Do not crash when listing keys without a keyring. Do not use random data for pass-phrases on EOF. Do not ask for a passphrase when empty. ---- src/lib/keyring.c.orig 2011-06-25 00:37:44.000000000 +0000 -+++ src/lib/keyring.c +--- a/src/lib/keyring.c 2011-06-25 00:37:44.000000000 +0000 ++++ b/src/lib/keyring.c @@ -226,7 +226,7 @@ typedef struct { pgp_seckey_t *seckey; } decrypt_t; diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch index afa077902d9..55b2122b4f7 100644 --- a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch +++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch @@ -2,8 +2,8 @@ $NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $ Sync with NetBSD src to fix build with OpenSSL 1.1. ---- src/lib/openssl_crypto.c.orig 2020-04-25 11:54:50.243962468 +0000 -+++ src/lib/openssl_crypto.c +--- a/src/lib/openssl_crypto.c 2020-04-25 11:54:50.243962468 +0000 ++++ b/src/lib/openssl_crypto.c @@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The #include "netpgpdigest.h" #include "packet.h" diff --git a/srcpkgs/netpgp/patches/lib_reader_c.patch b/srcpkgs/netpgp/patches/lib_reader_c.patch index 8be51eeda12..67fc3225909 100644 --- a/srcpkgs/netpgp/patches/lib_reader_c.patch +++ b/srcpkgs/netpgp/patches/lib_reader_c.patch @@ -2,8 +2,8 @@ $NetBSD: patch-src_lib_reader.c,v 1.1 2018/03/15 19:51:08 khorben Exp $ Do not truncate pass-phrases without a newline character. ---- src/lib/reader.c.orig 2012-03-05 02:20:18.000000000 +0000 -+++ src/lib/reader.c +--- a/src/lib/reader.c 2012-03-05 02:20:18.000000000 +0000 ++++ b/src/lib/reader.c @@ -160,6 +160,7 @@ int pgp_getpassphrase(void *in, char *phrase, size_t size) { diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch index 3438dcdaf0f..032f2814f40 100644 --- a/srcpkgs/netpgp/patches/lib_signature_c.patch +++ b/srcpkgs/netpgp/patches/lib_signature_c.patch @@ -4,8 +4,8 @@ Fix build with OpenSSL 1.1 by syncing with NetBSD src Output signatures to the standard output for "-". ---- src/lib/signature.c.orig 2012-03-05 02:20:18.000000000 +0000 -+++ src/lib/signature.c +--- a/src/lib/signature.c 2012-03-05 02:20:18.000000000 +0000 ++++ b/src/lib/signature.c @@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash, unsigned t; uint8_t hashbuf[NETPGP_BUFSIZ]; diff --git a/srcpkgs/netpgp/patches/netpgp_1.patch b/srcpkgs/netpgp/patches/netpgp_1.patch index ed990504fc3..4052795ac78 100644 --- a/srcpkgs/netpgp/patches/netpgp_1.patch +++ b/srcpkgs/netpgp/patches/netpgp_1.patch @@ -3,8 +3,8 @@ $NetBSD: patch-src_netpgp_netpgp.1,v 1.1 2018/03/15 20:14:14 khorben Exp $ Correct option "--armor". Also document alternate option "--detach". ---- src/netpgp/netpgp.1.orig 2014-02-17 07:23:18.000000000 +0000 -+++ src/netpgp/netpgp.1 +--- a/src/netpgp/netpgp.1 2014-02-17 07:23:18.000000000 +0000 ++++ b/src/netpgp/netpgp.1 @@ -203,7 +203,7 @@ library. In addition to one of the preceding commands, a number of qualifiers or options may be given. diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template index 30b5c9a4acb..2bc40e253d0 100644 --- a/srcpkgs/netpgp/template +++ b/srcpkgs/netpgp/template @@ -11,7 +11,6 @@ license="3-clause-BSD" homepage="http://www.netbsd.org" distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz" checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf -patch_args=-Np0 CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow" diff --git a/srcpkgs/netpgpverify/patches/install.patch b/srcpkgs/netpgpverify/patches/install.patch index 2915112f5a8..59990f06ba6 100644 --- a/srcpkgs/netpgpverify/patches/install.patch +++ b/srcpkgs/netpgpverify/patches/install.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2015-02-05 08:25:13.491988672 +0100 -+++ Makefile.in 2015-02-05 08:25:51.774946087 +0100 +--- a/Makefile.in 2015-02-05 08:25:13.491988672 +0100 ++++ b/Makefile.in 2015-02-05 08:25:51.774946087 +0100 @@ -19,7 +19,9 @@ ${PROG}: ${OBJS} ${CC} ${OBJS} -o ${PROG} diff --git a/srcpkgs/netpgpverify/template b/srcpkgs/netpgpverify/template index e554b5bcce1..03531032da5 100644 --- a/srcpkgs/netpgpverify/template +++ b/srcpkgs/netpgpverify/template @@ -10,7 +10,6 @@ license="2-clause-BSD" homepage="http://www.netpgp.com" distfiles="http://www.netpgp.com/src/${pkgname}-${version}.tar.gz" checksum=1eedf30b35cacbf8f39b80fbc4ea6129ba8c7815b0ad7f3d1ae05e521f684b00 -patch_args=-Np0 post_extract() { sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile.in diff --git a/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch index 315aebfdcb7..ce7c74779e8 100644 --- a/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch +++ b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch @@ -1,7 +1,7 @@ This ensures that efficient capability checks are used on musl. ---- fat-ppc.c -+++ fat-ppc.c +--- a/fat-ppc.c ++++ b/fat-ppc.c @@ -42,12 +42,10 @@ #if defined(_AIX) diff --git a/srcpkgs/nettle/patches/ppc64-elfv2.patch b/srcpkgs/nettle/patches/ppc64-elfv2.patch index c7d463b6a86..22f76582e0e 100644 --- a/srcpkgs/nettle/patches/ppc64-elfv2.patch +++ b/srcpkgs/nettle/patches/ppc64-elfv2.patch @@ -1,7 +1,7 @@ Ensure that ELFv2 ABI is used on all ppc64, including big endian. ---- powerpc64/machine.m4 -+++ powerpc64/machine.m4 +--- a/powerpc64/machine.m4 ++++ b/powerpc64/machine.m4 @@ -1,7 +1,7 @@ define(`PROLOGUE', `.globl C_NAME($1) diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template index 3880c516745..25eca0dcab0 100644 --- a/srcpkgs/nettle/template +++ b/srcpkgs/nettle/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="https://www.lysator.liu.se/~nisse/nettle/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0 -patch_args=-Np0 nettle-devel_package() { depends="gmp-devel ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch index a83f1ca7b38..f345c12c790 100644 --- a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch +++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch @@ -3,8 +3,8 @@ From: Arjen de Korte Date: Mon, 27 Nov 2017 21:10:13 +0100 Subject: [PATCH] Add support for openssl-1.1.0 ---- clients/upsclient.c -+++ clients/upsclient.c +--- a/clients/upsclient.c ++++ b/clients/upsclient.c @@ -299,11 +299,6 @@ { #ifdef WITH_OPENSSL @@ -67,8 +67,8 @@ Subject: [PATCH] Add support for openssl-1.1.0 break; case 0: upslog_with_errno(1, "SSL_connect do not accept handshake."); ---- clients/upssched.c -+++ clients/upssched.c +--- a/clients/upssched.c ++++ b/clients/upssched.c @@ -794,7 +794,7 @@ } @@ -78,8 +78,8 @@ Subject: [PATCH] Add support for openssl-1.1.0 upslogx(LOG_ERR, "Empty EXECUTE command argument"); return; } ---- m4/nut_check_libopenssl.m4 -+++ m4/nut_check_libopenssl.m4 +--- a/m4/nut_check_libopenssl.m4 ++++ b/m4/nut_check_libopenssl.m4 @@ -58,7 +58,7 @@ dnl check if openssl is usable @@ -89,8 +89,8 @@ Subject: [PATCH] Add support for openssl-1.1.0 if test "${nut_have_openssl}" = "yes"; then nut_with_ssl="yes" ---- server/netssl.c -+++ server/netssl.c +--- a/server/netssl.c ++++ b/server/netssl.c @@ -274,7 +274,7 @@ { case 1: @@ -149,8 +149,8 @@ Subject: [PATCH] Add support for openssl-1.1.0 if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) { ssl_debug(); ---- configure 2021-02-13 22:54:47.106372805 +0100 -+++ - 2021-02-13 22:58:18.010481917 +0100 +--- a/configure 2021-02-13 22:54:47.106372805 +0100 ++++ b/configure 2021-02-13 22:54:47.106372805 +0100 @@ -10399,10 +10399,10 @@ done diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template index b775d578f49..0f4f1ce5a3b 100644 --- a/srcpkgs/network-ups-tools/template +++ b/srcpkgs/network-ups-tools/template @@ -27,7 +27,6 @@ homepage="http://www.networkupstools.org/" distfiles="${homepage}source/${version%.*}/nut-${version}.tar.gz" checksum=980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7 system_accounts="nut" -patch_args=-Np0 nopie=yes build_options="cgi" diff --git a/srcpkgs/newlisp/patches/build-fixes.patch b/srcpkgs/newlisp/patches/build-fixes.patch index 17a8e34c587..919e83cc039 100644 --- a/srcpkgs/newlisp/patches/build-fixes.patch +++ b/srcpkgs/newlisp/patches/build-fixes.patch @@ -1,5 +1,5 @@ ---- makefile_linuxLP64_utf8_ffi.orig 2016-04-10 20:27:16.244225061 +0200 -+++ makefile_linuxLP64_utf8_ffi 2016-04-10 20:27:57.323104312 +0200 +--- a/makefile_linuxLP64_utf8_ffi 2016-04-10 20:27:16.244225061 +0200 ++++ b/makefile_linuxLP64_utf8_ffi 2016-04-10 20:27:57.323104312 +0200 @@ -6,19 +6,19 @@ OBJS = newlisp.o nl-symbol.o nl-math.o nl-list.o nl-liststr.o nl-string.o nl-filesys.o \ nl-sock.o nl-import.o nl-xml-json.o nl-web.o nl-matrix.o nl-debug.o nl-utf8.o pcre.o @@ -23,8 +23,8 @@ .c.o: $(CC) $(CFLAGS) $< ---- makefile_linuxLP64_utf8_ffi.orig 2016-04-10 20:30:01.588730930 +0200 -+++ makefile_linuxLP64_utf8_ffi 2016-04-10 20:30:33.211641988 +0200 +--- a/makefile_linuxLP64_utf8_ffi 2016-04-10 20:30:01.588730930 +0200 ++++ b/makefile_linuxLP64_utf8_ffi 2016-04-10 20:30:33.211641988 +0200 @@ -14,7 +14,7 @@ CFLAGS += -fPIC -Wall -Wno-uninitialized CC ?= gcc diff --git a/srcpkgs/newlisp/patches/newlisp-makefile-install-10.7.0.patch b/srcpkgs/newlisp/patches/newlisp-makefile-install-10.7.0.patch index 2a0ed774847..c3b921534e8 100644 --- a/srcpkgs/newlisp/patches/newlisp-makefile-install-10.7.0.patch +++ b/srcpkgs/newlisp/patches/newlisp-makefile-install-10.7.0.patch @@ -1,6 +1,6 @@ diff -Nuar a/makefile_original_install b/makefile_original_install ---- makefile_original_install 2015-01-19 18:10:12.000000000 +0100 -+++ makefile_original_install 2015-06-22 12:59:33.639980437 +0200 +--- a/makefile_original_install 2015-01-19 18:10:12.000000000 +0100 ++++ b/makefile_original_install 2015-06-22 12:59:33.639980437 +0200 @@ -31,7 +31,9 @@ -install -d $(datadir)/newlisp/modules -install -d $(datadir)/newlisp/util diff --git a/srcpkgs/newlisp/template b/srcpkgs/newlisp/template index 37e9c03cc42..d6459caa41c 100644 --- a/srcpkgs/newlisp/template +++ b/srcpkgs/newlisp/template @@ -9,7 +9,6 @@ license="GPL-3.0-only, GFDL-1.2-only, Zlib, $pkgname, BSD-3-Clause" homepage="http://www.newlisp.org" distfiles="$homepage/downloads/$pkgname-$version.tgz" checksum=dc2d0ff651c2b275bc4af3af8ba59851a6fb6e1eaddc20ae75fb60b1e90126ec -patch_args=-Np0 do_build() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/nextcloud-client/patches/fallback-primary-screen.patch b/srcpkgs/nextcloud-client/patches/fallback-primary-screen.patch index 303f0a1ac72..d05a994bc35 100644 --- a/srcpkgs/nextcloud-client/patches/fallback-primary-screen.patch +++ b/srcpkgs/nextcloud-client/patches/fallback-primary-screen.patch @@ -1,6 +1,6 @@ upstream: https://github.com/nextcloud/desktop/commit/aadee15008ca4974e542f3fb6ca1694592d9e6fe ---- src/gui/wizard/owncloudwizard.cpp -+++ src/gui/wizard/owncloudwizard.cpp +--- a/src/gui/wizard/owncloudwizard.cpp ++++ b/src/gui/wizard/owncloudwizard.cpp @@ -116,7 +116,10 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) void OwncloudWizard::centerWindow() { diff --git a/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch b/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch index 58d43431868..5afd721f392 100644 --- a/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch +++ b/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch @@ -12,8 +12,8 @@ following settings of cmake/modules/Warnings.cmake diff --git src/CMakeLists.txt src/CMakeLists.txt index f29349582..6f3145331 100644 ---- src/CMakeLists.txt -+++ src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -30,10 +30,12 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") endif() diff --git a/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch b/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch index b049701370e..956a9cc221d 100644 --- a/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch +++ b/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch @@ -1,7 +1,7 @@ is wrong if running within a user's chroot ---- test/testfolderman.cpp.ORIG 2020-09-24 14:51:48.000000000 +0200 -+++ test/testfolderman.cpp 2020-10-02 20:33:32.248359240 +0200 +--- a/test/testfolderman.cpp 2020-09-24 14:51:48.000000000 +0200 ++++ b/test/testfolderman.cpp 2020-10-02 20:33:32.248359240 +0200 @@ -119,10 +119,6 @@ // Subfolder of links QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull()); diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template index ebce167c269..ec201254d5a 100644 --- a/srcpkgs/nextcloud-client/template +++ b/srcpkgs/nextcloud-client/template @@ -20,7 +20,6 @@ license="GPL-2.0-or-later" homepage="https://nextcloud.com/clients/" distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz" checksum=f2d387d35276ea6e6da3ae339ede3d89be81dd4af735739ec280709008eb6645 -patch_args=-Np0 build_options="dolphin" desc_option_dolphin="Build KDE dolphin support" diff --git a/srcpkgs/nfs4-acl-tools/patches/Makefile.patch b/srcpkgs/nfs4-acl-tools/patches/Makefile.patch index 8c8571c3b40..e41aaf8e0a5 100644 --- a/srcpkgs/nfs4-acl-tools/patches/Makefile.patch +++ b/srcpkgs/nfs4-acl-tools/patches/Makefile.patch @@ -1,5 +1,5 @@ ---- Makefile 2018-08-21 18:07:51.000000000 +0200 -+++ Makefile.new 2018-10-02 11:16:49.335221638 +0200 +--- a/Makefile 2018-08-21 18:07:51.000000000 +0200 ++++ b/Makefile.new 2018-10-02 11:16:49.335221638 +0200 @@ -61,16 +61,7 @@ $(CONFIGURE): aclocal.m4 diff --git a/srcpkgs/nfs4-acl-tools/template b/srcpkgs/nfs4-acl-tools/template index 3ac57c33963..defeeccdfbf 100644 --- a/srcpkgs/nfs4-acl-tools/template +++ b/srcpkgs/nfs4-acl-tools/template @@ -14,7 +14,6 @@ homepage="http://linux-nfs.org/wiki/index.php/Main_Page" distfiles="http://linux-nfs.org/~bfields/${pkgname}/${pkgname}-${version}.tar.gz" checksum=1b929f15b7b8d1701a416a0888df61a2a173b50eeaa9fed4f28543ffe8989503 disable_parallel_build=yes -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" diff --git a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch b/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch index f91962c54ce..4bb73f5ebb2 100644 --- a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch +++ b/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch @@ -1,6 +1,6 @@ ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237757#c5 ---- src/event/ngx_event_openssl_stapling.c.org 2019-05-12 23:56:58.526833000 +0200 -+++ src/event/ngx_event_openssl_stapling.c 2019-05-13 01:31:53.737800000 +0200 +--- a/src/event/ngx_event_openssl_stapling.c.org 2019-05-12 23:56:58.526833000 +0200 ++++ b/src/event/ngx_event_openssl_stapling.c 2019-05-13 01:31:53.737800000 +0200 @@ -298,7 +298,10 @@ SSL_CTX_select_current_cert(ssl->ctx, cert); #endif diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index 281ebf038e0..cd0b19da95c 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -11,7 +11,6 @@ license="BSD-2-Clause" homepage="https://nginx.org" distfiles="https://nginx.org/download/nginx-${version}.tar.gz" checksum=4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99 -patch_args=-Np0 # NOTE: # On update, the pregenerated header file for ARM may need synchronization. diff --git a/srcpkgs/ngspice/patches/windows-only.patch b/srcpkgs/ngspice/patches/windows-only.patch index 5f661864184..8a9ead11e31 100644 --- a/srcpkgs/ngspice/patches/windows-only.patch +++ b/srcpkgs/ngspice/patches/windows-only.patch @@ -2,8 +2,8 @@ libshlwapi is Windows-only diff --git src/xspice/cmpp/Makefile.in src/xspice/cmpp/Makefile.in index b450e8c..2ea8716 100644 ---- src/xspice/cmpp/Makefile.in -+++ src/xspice/cmpp/Makefile.in +--- a/src/xspice/cmpp/Makefile.in ++++ b/src/xspice/cmpp/Makefile.in @@ -753,7 +753,7 @@ ifs_yacc.c : ifs_yacc.y @CROSS_COMPILING_TRUE@build/cmpp$(BUILD_EXEEXT) : $(BUILD_CMPP_FILES) diff --git a/srcpkgs/ngspice/template b/srcpkgs/ngspice/template index 8e7bde57e3d..05beffd8f84 100644 --- a/srcpkgs/ngspice/template +++ b/srcpkgs/ngspice/template @@ -12,7 +12,6 @@ license="BSD-3-Clause" homepage="http://ngspice.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/ngspice/ng-spice-rework/${version}/${pkgname}-${version}.tar.gz" checksum=b99db66cc1c57c44e9af1ef6ccb1dcbc8ae1df3e35acf570af578f606f8541f1 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/nitroshare/patches/fix-build-with-qt-5-11.patch b/srcpkgs/nitroshare/patches/fix-build-with-qt-5-11.patch index ec587957a3d..56541d398c6 100644 --- a/srcpkgs/nitroshare/patches/fix-build-with-qt-5-11.patch +++ b/srcpkgs/nitroshare/patches/fix-build-with-qt-5-11.patch @@ -1,6 +1,6 @@ diff -Nru src/application/splashdialog.cpp src/application/splashdialog.cpp ---- src/application/splashdialog.cpp 2017-10-13 00:32:54.000000000 +0200 -+++ src/application/splashdialog.cpp 2018-06-01 03:45:40.631194527 +0200 +--- a/src/application/splashdialog.cpp 2017-10-13 00:32:54.000000000 +0200 ++++ b/src/application/splashdialog.cpp 2018-06-01 03:45:40.631194527 +0200 @@ -24,6 +24,7 @@ #include diff --git a/srcpkgs/nitroshare/template b/srcpkgs/nitroshare/template index cfab290eea9..dc541b408d7 100644 --- a/srcpkgs/nitroshare/template +++ b/srcpkgs/nitroshare/template @@ -17,7 +17,6 @@ homepage="http://nitroshare.net" distfiles="https://github.com/nitroshare/nitroshare-desktop/archive/${version}.tar.gz" checksum=29874e5909c29211a3c9e13f8c0f49b901ec2996e5d60d80af80d2fb80c3d7ec python_version=2 #unverified -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools" diff --git a/srcpkgs/nm-tray/patches/ftbfs.patch b/srcpkgs/nm-tray/patches/ftbfs.patch index 64f65f77caf..1458bb63a9a 100644 --- a/srcpkgs/nm-tray/patches/ftbfs.patch +++ b/srcpkgs/nm-tray/patches/ftbfs.patch @@ -1,5 +1,5 @@ ---- src/nmmodel.cpp -+++ src/nmmodel.cpp +--- a/src/nmmodel.cpp ++++ b/src/nmmodel.cpp @@ -45,6 +45,7 @@ COPYRIGHT_HEADER*/ #include #include diff --git a/srcpkgs/nm-tray/template b/srcpkgs/nm-tray/template index 2acc4a68f43..b2a3e85cf57 100644 --- a/srcpkgs/nm-tray/template +++ b/srcpkgs/nm-tray/template @@ -12,4 +12,3 @@ license="GPL-2.0-or-later" homepage="https://github.com/palinek/nm-tray" distfiles="https://github.com/palinek/nm-tray/archive/${version}.tar.gz" checksum=1611c053582189091efa74c2f26277afc872a57cfd4ec9e54463f68c25ad284b -patch_args=-Np0 diff --git a/srcpkgs/nmon/patches/musl-fixes.patch b/srcpkgs/nmon/patches/musl-fixes.patch index 36efd072419..a9da244e9ce 100644 --- a/srcpkgs/nmon/patches/musl-fixes.patch +++ b/srcpkgs/nmon/patches/musl-fixes.patch @@ -1,5 +1,5 @@ ---- lmon16m.c 2019-04-19 14:59:07.091281022 -0500 -+++ lmon16m.c 2019-04-19 15:01:58.550285273 -0500 +--- a/lmon16m.c 2019-04-19 14:59:07.091281022 -0500 ++++ b/lmon16m.c 2019-04-19 15:01:58.550285273 -0500 @@ -61,7 +61,7 @@ #include #include diff --git a/srcpkgs/nmon/template b/srcpkgs/nmon/template index 1857023f540..76f09917ade 100644 --- a/srcpkgs/nmon/template +++ b/srcpkgs/nmon/template @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" homepage="http://nmon.sourceforge.net/pmwiki.php?n=Main.HomePage" distfiles="${SOURCEFORGE_SITE}/nmon/files/lmon${version}.c" checksum=2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1 -patch_args=-Np0 do_build() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/nocache/patches/musl.patch b/srcpkgs/nocache/patches/musl.patch index 731181fbb99..32871209812 100644 --- a/srcpkgs/nocache/patches/musl.patch +++ b/srcpkgs/nocache/patches/musl.patch @@ -1,7 +1,7 @@ diff --git nocache.c nocache.c index 6f8c60d..fa4abff 100644 ---- nocache.c -+++ nocache.c +--- a/nocache.c ++++ b/nocache.c @@ -25,31 +25,47 @@ static void store_pageinfo(int fd); static void free_unclaimed_pages(int fd); diff --git a/srcpkgs/nocache/template b/srcpkgs/nocache/template index f48b963e927..1c4198631e7 100644 --- a/srcpkgs/nocache/template +++ b/srcpkgs/nocache/template @@ -9,7 +9,6 @@ license="BSD-2-Clause" homepage="https://github.com/Feh/nocache" distfiles="https://github.com/Feh/nocache/archive/v${version}.tar.gz" checksum=e5441b27f60e1af5551b76fe0c8a9da17b8c31675794d9d49bf59c7c47fbb9b9 -patch_args=-Np0 pre_build() { sed -i -e '/#include /d' cachedel.c cachestats.c diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch index 023cfad0123..21ec8310142 100644 --- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch +++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch @@ -1,5 +1,5 @@ ---- node.gyp -+++ node.gyp +--- a/node.gyp ++++ b/node.gyp @@ -479,6 +479,11 @@ 'msvs_disabled_warnings!': [4244], diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch index 4650b285c36..dd2440b372b 100644 --- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch +++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch @@ -1,5 +1,5 @@ ---- configure.py -+++ configure.py +--- a/configure.py ++++ b/configure.py @@ -848,7 +848,7 @@ def host_arch_cc(): '__MIPSEL__' : 'mipsel', '__mips__' : 'mips', @@ -9,8 +9,8 @@ '__x86_64__' : 'x64', '__s390__' : 's390', '__s390x__' : 's390x', ---- deps/v8/src/libsampler/sampler.cc -+++ deps/v8/src/libsampler/sampler.cc +--- a/deps/v8/src/libsampler/sampler.cc ++++ b/deps/v8/src/libsampler/sampler.cc @@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) { reinterpret_cast(ucontext->uc_mcontext.regs->gpr[PT_R31]); #else diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch index 8190db1ce6f..98e515cf430 100644 --- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch +++ b/srcpkgs/nodejs-lts-10/patches/ppc64.patch @@ -1,6 +1,6 @@ Taken from Adélie Linux, fixes node on big endian ELFv2. ---- deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000 -+++ deps/v8/src/ppc/assembler-ppc.h 2019-04-02 07:05:25.977213735 +0000 +--- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000 ++++ b/deps/v8/src/ppc/assembler-ppc.h 2019-04-02 07:05:25.977213735 +0000 @@ -48,7 +48,8 @@ #include "src/ppc/constants-ppc.h" diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template index 864b387e62e..300667cb978 100644 --- a/srcpkgs/nodejs-lts-10/template +++ b/srcpkgs/nodejs-lts-10/template @@ -21,7 +21,6 @@ homepage="https://nodejs.org/" distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz" checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc python_version=3 -patch_args=-Np0 build_options="ssl libuv http_parser icu nghttp2 cares" desc_option_ssl="Enable shared openssl" diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch index 502d471429f..ddfceb2f217 100644 --- a/srcpkgs/nodejs-lts/patches/ppc32.patch +++ b/srcpkgs/nodejs-lts/patches/ppc32.patch @@ -1,5 +1,5 @@ ---- deps/v8/src/libsampler/sampler.cc.orig -+++ deps/v8/src/libsampler/sampler.cc +--- a/deps/v8/src/libsampler/sampler.cc ++++ b/deps/v8/src/libsampler/sampler.cc @@ -423,10 +423,17 @@ state->lr = reinterpret_cast(ucontext->uc_mcontext.regs->link); #else diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch index 3e609a6c49a..01e95f15b47 100644 --- a/srcpkgs/nodejs-lts/patches/shared-uv.patch +++ b/srcpkgs/nodejs-lts/patches/shared-uv.patch @@ -1,5 +1,5 @@ ---- deps/uvwasi/uvwasi.gyp.orig -+++ deps/uvwasi/uvwasi.gyp +--- a/deps/uvwasi/uvwasi.gyp ++++ b/deps/uvwasi/uvwasi.gyp @@ -18,9 +18,6 @@ 'src/wasi_rights.c', 'src/wasi_serdes.c', diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template index 4f7524766d8..d3912ae2cf0 100644 --- a/srcpkgs/nodejs-lts/template +++ b/srcpkgs/nodejs-lts/template @@ -20,7 +20,6 @@ homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e python_version=3 -patch_args=-Np0 build_options="ssl libuv http_parser icu nghttp2 cares" desc_option_ssl="Enable shared openssl" diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch index 502d471429f..ddfceb2f217 100644 --- a/srcpkgs/nodejs/patches/ppc32.patch +++ b/srcpkgs/nodejs/patches/ppc32.patch @@ -1,5 +1,5 @@ ---- deps/v8/src/libsampler/sampler.cc.orig -+++ deps/v8/src/libsampler/sampler.cc +--- a/deps/v8/src/libsampler/sampler.cc ++++ b/deps/v8/src/libsampler/sampler.cc @@ -423,10 +423,17 @@ state->lr = reinterpret_cast(ucontext->uc_mcontext.regs->link); #else diff --git a/srcpkgs/nodejs/patches/shared-uv.patch b/srcpkgs/nodejs/patches/shared-uv.patch index 3e609a6c49a..01e95f15b47 100644 --- a/srcpkgs/nodejs/patches/shared-uv.patch +++ b/srcpkgs/nodejs/patches/shared-uv.patch @@ -1,5 +1,5 @@ ---- deps/uvwasi/uvwasi.gyp.orig -+++ deps/uvwasi/uvwasi.gyp +--- a/deps/uvwasi/uvwasi.gyp ++++ b/deps/uvwasi/uvwasi.gyp @@ -18,9 +18,6 @@ 'src/wasi_rights.c', 'src/wasi_serdes.c', diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index c8d7b6324ba..bcfaaa73ac4 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -20,7 +20,6 @@ homepage="https://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" checksum=f6b904b06951de4c52089dd4456155d853e835b0dc4640f75458c6eb49f9e8ce python_version=3 -patch_args=-Np0 build_options="ssl libuv http_parser icu nghttp2 cares" desc_option_ssl="Enable shared openssl" diff --git a/srcpkgs/noip2/patches/01-foreground.patch b/srcpkgs/noip2/patches/01-foreground.patch index b82da34ed23..948bc416678 100644 --- a/srcpkgs/noip2/patches/01-foreground.patch +++ b/srcpkgs/noip2/patches/01-foreground.patch @@ -1,5 +1,5 @@ ---- noip2.c.old 2015-01-05 18:06:18.704641169 -0200 -+++ noip2.c 2015-01-05 18:07:45.157639072 -0200 +--- a/noip2.c.old 2015-01-05 18:06:18.704641169 -0200 ++++ b/noip2.c 2015-01-05 18:07:45.157639072 -0200 @@ -130,6 +130,10 @@ + hardened autoconf() the same way + patch suggested by xenomuta@phreaker.net diff --git a/srcpkgs/noip2/patches/02-fix_foreground.patch b/srcpkgs/noip2/patches/02-fix_foreground.patch index b89e1652dde..d64d82284c9 100644 --- a/srcpkgs/noip2/patches/02-fix_foreground.patch +++ b/srcpkgs/noip2/patches/02-fix_foreground.patch @@ -1,5 +1,5 @@ ---- noip2.c.old 2015-01-06 14:47:18.998335680 -0200 -+++ noip2.c 2015-01-06 14:47:36.957335245 -0200 +--- a/noip2.c.old 2015-01-06 14:47:18.998335680 -0200 ++++ b/noip2.c 2015-01-06 14:47:36.957335245 -0200 @@ -134,6 +134,10 @@ + added -f flag to run in foreground + patch suggested by rogi@skylittlesystem.org diff --git a/srcpkgs/noip2/patches/03-prefix.patch b/srcpkgs/noip2/patches/03-prefix.patch index c80605bf152..aa11baeddc7 100644 --- a/srcpkgs/noip2/patches/03-prefix.patch +++ b/srcpkgs/noip2/patches/03-prefix.patch @@ -1,5 +1,5 @@ ---- noip2.c.old 2015-01-05 15:40:56.269596723 -0200 -+++ noip2.c 2015-01-05 15:41:51.549595383 -0200 +--- a/noip2.c.old 2015-01-05 15:40:56.269596723 -0200 ++++ b/noip2.c 2015-01-05 15:41:51.549595383 -0200 @@ -240,10 +240,10 @@ #define GROUP 2 #define DOMAIN 3 diff --git a/srcpkgs/noip2/template b/srcpkgs/noip2/template index b6e7636edcf..9d930a41b73 100644 --- a/srcpkgs/noip2/template +++ b/srcpkgs/noip2/template @@ -9,7 +9,6 @@ license="GPL-2.0-or-later" homepage="http://www.noip.com" distfiles="https://www.noip.com/client/linux/noip-duc-linux.tar.gz" checksum=82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593 -patch_args=-Np0 do_build() { make CC=$CC PREFIX=/usr LIBS="$CFLAGS $LDFLAGS" diff --git a/srcpkgs/nootka/patches/signed-char.patch b/srcpkgs/nootka/patches/signed-char.patch index c61c13a02fc..28a266749cb 100644 --- a/srcpkgs/nootka/patches/signed-char.patch +++ b/srcpkgs/nootka/patches/signed-char.patch @@ -6,8 +6,8 @@ Date: Thu Jan 2 00:36:14 2020 +0100 diff --git src/libs/core/music/tkeysignature.cpp src/libs/core/music/tkeysignature.cpp index 51ccf34..0024770 100644 ---- src/libs/core/music/tkeysignature.cpp -+++ src/libs/core/music/tkeysignature.cpp +--- a/src/libs/core/music/tkeysignature.cpp ++++ b/src/libs/core/music/tkeysignature.cpp @@ -25,7 +25,7 @@ @@ -30,8 +30,8 @@ index 51ccf34..0024770 100644 QString(), QString(), QString(), QString(), QString(), diff --git src/libs/core/music/tkeysignature.h src/libs/core/music/tkeysignature.h index 6c98d66..676d3b9 100644 ---- src/libs/core/music/tkeysignature.h -+++ src/libs/core/music/tkeysignature.h +--- a/src/libs/core/music/tkeysignature.h ++++ b/src/libs/core/music/tkeysignature.h @@ -43,13 +43,13 @@ public: /** Array with definitions of each scale. * @p scalesDefArr[7] is C-major/a-minor and has 7 times 0 (no accids). diff --git a/srcpkgs/nootka/template b/srcpkgs/nootka/template index 3ee39181a31..8726ab984e8 100644 --- a/srcpkgs/nootka/template +++ b/srcpkgs/nootka/template @@ -12,4 +12,3 @@ license="GPL-3.0-only" homepage="https://nootka.sourceforge.io" distfiles="${SOURCEFORGE_SITE}/nootka/Nootka-${version}/nootka-${version}-source.tar.bz2" checksum=1d85a2970ddb51117b0a98df4d84ca9e9498fbd1d2b1c55bfa62931333a73cf9 -patch_args=-Np0 diff --git a/srcpkgs/notepadqq/patches/disable-stats.patch b/srcpkgs/notepadqq/patches/disable-stats.patch index 505b1d54fe6..f1aeb8a73e0 100644 --- a/srcpkgs/notepadqq/patches/disable-stats.patch +++ b/srcpkgs/notepadqq/patches/disable-stats.patch @@ -1,6 +1,6 @@ # disable collection of system statics ---- src/ui/stats.cpp -+++ src/ui/stats.cpp +--- a/src/ui/stats.cpp ++++ b/src/ui/stats.cpp @@ -19,6 +19,7 @@ void Stats::init() diff --git a/srcpkgs/notepadqq/template b/srcpkgs/notepadqq/template index 85e8349e031..194588600db 100644 --- a/srcpkgs/notepadqq/template +++ b/srcpkgs/notepadqq/template @@ -12,7 +12,6 @@ homepage="https://notepadqq.com" license="GPL-3.0-or-later" distfiles="https://github.com/notepadqq/notepadqq/archive/v${version}.tar.gz" checksum=13fba9abd84c59de27fbe92f74e2763b57588fcf9c88af10ec67313b0abbc9d0 -patch_args=-Np0 post_install() { # no need for upstream's weird magic, leads to segfaults anyway diff --git a/srcpkgs/notes-up/patches/vala-0.50.patch b/srcpkgs/notes-up/patches/vala-0.50.patch index 3cb0a75b521..2d6bfb9ee45 100644 --- a/srcpkgs/notes-up/patches/vala-0.50.patch +++ b/srcpkgs/notes-up/patches/vala-0.50.patch @@ -1,5 +1,5 @@ ---- vapi/libmarkdown.vapi.orig 2020-11-21 13:32:35.540125253 +0700 -+++ vapi/libmarkdown.vapi 2020-11-21 13:40:04.961780640 +0700 +--- a/vapi/libmarkdown.vapi 2020-11-21 13:32:35.540125253 +0700 ++++ b/vapi/libmarkdown.vapi 2020-11-21 13:40:04.961780640 +0700 @@ -41,7 +41,7 @@ public void initialize (); public void with_html5_tags (); diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template index 22f5e8b400b..8fcacc6f4d9 100644 --- a/srcpkgs/notes-up/template +++ b/srcpkgs/notes-up/template @@ -17,7 +17,6 @@ distfiles="https://github.com/Philip-Scott/Notes-up/archive/${version}.tar.gz" checksum=35eb1df71034a118e66e6e00f5394c68423cfba7ceac035bde156d77da933b17 build_options="pantheon" desc_option_pantheon="build with Contractor support" -patch_args=-Np0 post_install() { ln -s com.github.philip-scott.notes-up ${DESTDIR}/usr/bin/notes-up diff --git a/srcpkgs/nrpe/patches/nrpe-4.0.2-libressl.patch b/srcpkgs/nrpe/patches/nrpe-4.0.2-libressl.patch index 76287b23092..5bcccc32fcb 100644 --- a/srcpkgs/nrpe/patches/nrpe-4.0.2-libressl.patch +++ b/srcpkgs/nrpe/patches/nrpe-4.0.2-libressl.patch @@ -1,5 +1,5 @@ ---- src/nrpe.c 2020-03-11 11:40:10.000000000 -0400 -+++ src/nrpe.c.new 2020-03-18 19:29:00.770969682 -0400 +--- a/src/nrpe.c 2020-03-11 11:40:10.000000000 -0400 ++++ b/src/nrpe.c.new 2020-03-18 19:29:00.770969682 -0400 @@ -147,7 +147,7 @@ ClntCerts client_certs; SslLogging log_opts; @@ -32,8 +32,8 @@ strncpy(sslprm.cipher_list, "ADH@SECLEVEL=0", MAX_FILENAME_LENGTH - 1); #else strncpy(sslprm.cipher_list, "ADH", MAX_FILENAME_LENGTH - 1); ---- src/check_nrpe.c 2020-03-11 11:40:10.000000000 -0400 -+++ src/check_nrpe.c.new 2020-03-18 19:52:05.734304117 -0400 +--- a/src/check_nrpe.c 2020-03-11 11:40:10.000000000 -0400 ++++ b/src/check_nrpe.c.new 2020-03-18 19:52:05.734304117 -0400 @@ -905,11 +905,11 @@ switch(sslprm.ssl_proto_ver) { diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template index fd07a184553..6a598b0909e 100644 --- a/srcpkgs/nrpe/template +++ b/srcpkgs/nrpe/template @@ -21,7 +21,6 @@ changelog="https://github.com/NagiosEnterprises/nrpe/blob/master/CHANGELOG.md" distfiles="https://github.com/NagiosEnterprises/${pkgname}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz" checksum=f907ba15381adfc6eef211508abd027f8e1973116080faa4534a1191211c0340 system_accounts="_nagios" -patch_args=-Np0 post_install() { vsv nrpe diff --git a/srcpkgs/nsjail/patches/kafel-bison.patch b/srcpkgs/nsjail/patches/kafel-bison.patch index 2ed2479f37c..48eff0d3636 100644 --- a/srcpkgs/nsjail/patches/kafel-bison.patch +++ b/srcpkgs/nsjail/patches/kafel-bison.patch @@ -16,8 +16,8 @@ arm_syscalls.c:(.text+0x6984): undefined reference to `YYUSE' diff --git kafel/src/parser.y kafel/src/parser.y index e0f109c..0e01373 100644 ---- kafel/src/parser.y -+++ kafel/src/parser.y +--- a/kafel/src/parser.y ++++ b/kafel/src/parser.y @@ -420,8 +420,8 @@ const_def void yyerror(YYLTYPE * loc, struct kafel_ctxt* ctxt, yyscan_t scanner, diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index 8a883f9d1d6..acff592d2ee 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -13,7 +13,6 @@ distfiles="https://github.com/google/nsjail/archive/${version}.tar.gz https://github.com/google/kafel/archive/8e69b8efae415cde3debffbb1e379d9e7a16835a.tar.gz" checksum="cfa66d3ed136b2e221752287b95e544915e8a6760aa866f023b604d14a374919 4a6c9a1a70ed99bbed767adc106081b017a3090307ea88cc7e329b82daa1373b" -patch_args=-Np0 archs="aarch64* armv5tel* armv6l* armv7l* x86_64*" diff --git a/srcpkgs/nspr/patches/mips-sgidefs_h.patch b/srcpkgs/nspr/patches/mips-sgidefs_h.patch index fcff3ff2739..f5ae9e6cc8e 100644 --- a/srcpkgs/nspr/patches/mips-sgidefs_h.patch +++ b/srcpkgs/nspr/patches/mips-sgidefs_h.patch @@ -1,5 +1,5 @@ ---- nspr/pr/include/md/_linux.cfg 2017-09-19 18:32:26.000000000 +0200 -+++ nspr/pr/include/md/_linux.cfg 2017-11-08 23:02:42.907551130 +0100 +--- a/nspr/pr/include/md/_linux.cfg 2017-09-19 18:32:26.000000000 +0200 ++++ b/nspr/pr/include/md/_linux.cfg 2017-11-08 23:02:42.907551130 +0100 @@ -499,7 +499,7 @@ #elif defined(__mips__) diff --git a/srcpkgs/nspr/patches/ppc64-default-stack-size.diff b/srcpkgs/nspr/patches/ppc64-default-stack-size.diff index 86e438aea0f..2584727c5dd 100644 --- a/srcpkgs/nspr/patches/ppc64-default-stack-size.diff +++ b/srcpkgs/nspr/patches/ppc64-default-stack-size.diff @@ -9,8 +9,8 @@ the stack size set call would fail and everything would fall back on the default 2M stacksize, but it would still be wrong - therefore, establish a minimum, just like for aarch64. ---- nspr/pr/include/md/_linux.h -+++ nspr/pr/include/md/_linux.h +--- a/nspr/pr/include/md/_linux.h ++++ b/nspr/pr/include/md/_linux.h @@ -71,7 +71,7 @@ #define _MD_DEFAULT_STACK_SIZE 65536L #define _MD_MMAP_FLAGS MAP_PRIVATE diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template index f9f4c941d12..2873d90183a 100644 --- a/srcpkgs/nspr/template +++ b/srcpkgs/nspr/template @@ -11,7 +11,6 @@ license="MPL-2.0" homepage="http://www.mozilla.org/projects/nspr/" distfiles="${MOZILLA_SITE}/nspr/releases/v${version}/src/${pkgname}-${version}.tar.gz" checksum=5729da87d5fbf1584b72840751e0c6f329b5d541850cacd1b61652c95015abc8 -patch_args=-Np0 do_configure() { CFLAGS="$CFLAGS -D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE" diff --git a/srcpkgs/nss/patches/32ebd26354548fc3f883a56e8bfafc78f5265ce8.patch b/srcpkgs/nss/patches/32ebd26354548fc3f883a56e8bfafc78f5265ce8.patch index 8317fb28f50..dee246482de 100644 --- a/srcpkgs/nss/patches/32ebd26354548fc3f883a56e8bfafc78f5265ce8.patch +++ b/srcpkgs/nss/patches/32ebd26354548fc3f883a56e8bfafc78f5265ce8.patch @@ -14,8 +14,8 @@ extra : moz-landing-system : lando diff --git a/lib/freebl/ppc-gcm.s b/lib/freebl/ppc-gcm.s index 4d5fff437..06ad5862c 100644 ---- nss/lib/freebl/ppc-gcm.s -+++ nss/lib/freebl/ppc-gcm.s +--- a/nss/lib/freebl/ppc-gcm.s ++++ b/nss/lib/freebl/ppc-gcm.s @@ -692,7 +692,6 @@ addi TOCP,TOCP,(.TOC.-ppc_aes_gcmCRYPT)@l mtctr 9 diff --git a/srcpkgs/nss/patches/73b47b7cb5133302087980ef321a83670d383db1.patch b/srcpkgs/nss/patches/73b47b7cb5133302087980ef321a83670d383db1.patch index a2ef8f760fc..adf63004e54 100644 --- a/srcpkgs/nss/patches/73b47b7cb5133302087980ef321a83670d383db1.patch +++ b/srcpkgs/nss/patches/73b47b7cb5133302087980ef321a83670d383db1.patch @@ -14,8 +14,8 @@ extra : moz-landing-system : lando diff --git a/lib/freebl/ppc-gcm-wrap.c b/lib/freebl/ppc-gcm-wrap.c index ca3d8ee69..ac58744cb 100644 ---- nss/lib/freebl/ppc-gcm-wrap.c -+++ nss/lib/freebl/ppc-gcm-wrap.c +--- a/nss/lib/freebl/ppc-gcm-wrap.c ++++ b/nss/lib/freebl/ppc-gcm-wrap.c @@ -155,7 +155,7 @@ ppc_aes_gcmInitCounter(ppc_AES_GCMContext *gcm, /* Promote the counter by 1 */ gcm->CTR[14] += !(++gcm->CTR[15]); diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 1ae8f62b0b9..24da85cec75 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -1,5 +1,4 @@ # Template file for 'nss' -patch_args=-Np0 _nsprver=4.30 diff --git a/srcpkgs/ntp/patches/fix_build.diff b/srcpkgs/ntp/patches/fix_build.diff index b29e387dcd0..46f7d723b6d 100644 --- a/srcpkgs/ntp/patches/fix_build.diff +++ b/srcpkgs/ntp/patches/fix_build.diff @@ -1,5 +1,5 @@ ---- include/ntp_syscall.h.orig 2009-12-12 23:58:39.718973170 +0100 -+++ include/ntp_syscall.h 2009-12-12 23:59:18.544001686 +0100 +--- a/include/ntp_syscall.h 2009-12-12 23:58:39.718973170 +0100 ++++ b/include/ntp_syscall.h 2009-12-12 23:59:18.544001686 +0100 @@ -14,6 +14,14 @@ # include #endif diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index 523c61db5c0..fa88f33f92b 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -13,7 +13,6 @@ license="NTP" homepage="http://www.ntp.org/" distfiles="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${version}.tar.gz" checksum=f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19 -patch_args=-Np0 make_dirs="/var/db/ntpd 0755 ntpd ntpd" conf_files="/etc/ntp.conf" diff --git a/srcpkgs/numactl/patches/hardening.patch b/srcpkgs/numactl/patches/hardening.patch index 88adec6de80..50e9e066d09 100644 --- a/srcpkgs/numactl/patches/hardening.patch +++ b/srcpkgs/numactl/patches/hardening.patch @@ -1,7 +1,7 @@ diff --git Makefile.am Makefile.am index 44d0d76..ee66e54 100644 ---- Makefile.am -+++ Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -28,7 +28,7 @@ numademo_CFLAGS = $(AM_CFLAGS) -O3 -ffast-math -funroll-loops if HAVE_TREE_VECTORIZE numademo_CFLAGS += -ftree-vectorize diff --git a/srcpkgs/numactl/patches/musl.patch b/srcpkgs/numactl/patches/musl.patch index 1537d85cad6..a566f050680 100644 --- a/srcpkgs/numactl/patches/musl.patch +++ b/srcpkgs/numactl/patches/musl.patch @@ -1,7 +1,7 @@ __GLIBC_PREREQ is only defined with glibc, so that only process it with __GLIBC__. ---- syscall.c.orig 2014-10-20 16:12:53.000000000 +0200 -+++ syscall.c 2015-06-22 08:13:22.729034702 +0200 +--- a/syscall.c 2014-10-20 16:12:53.000000000 +0200 ++++ b/syscall.c 2015-06-22 08:13:22.729034702 +0200 @@ -115,14 +115,16 @@ #endif diff --git a/srcpkgs/numactl/template b/srcpkgs/numactl/template index ca70de19109..ca5ecf3b3f1 100644 --- a/srcpkgs/numactl/template +++ b/srcpkgs/numactl/template @@ -10,7 +10,6 @@ license="LGPL-2.1-only" homepage="https://github.com/numactl/numactl" distfiles="https://github.com/numactl/numactl/archive/v${version}.tar.gz" checksum=1ee27abd07ff6ba140aaf9bc6379b37825e54496e01d6f7343330cf1a4487035 -patch_args=-Np0 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then # XXX diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch index 966ce6c0ec9..ef0b0b4df24 100644 --- a/srcpkgs/nvme-cli/patches/dracut-warning.patch +++ b/srcpkgs/nvme-cli/patches/dracut-warning.patch @@ -1,5 +1,5 @@ ---- nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in.orig 2021-01-24 16:37:06.346511231 +0700 -+++ nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in 2021-01-24 16:38:01.351158511 +0700 +--- a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in 2021-01-24 16:37:06.346511231 +0700 ++++ b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in 2021-01-24 16:38:01.351158511 +0700 @@ -1 +1 @@ -install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules" +install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules " diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template index 35301436ec7..0da50f2663e 100644 --- a/srcpkgs/nvme-cli/template +++ b/srcpkgs/nvme-cli/template @@ -15,7 +15,6 @@ homepage="http://nvmexpress.org" distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz" checksum=03f4875f3e68d326b0280e16df2f027ca6b086cfa148c34e8569df61319b4b85 conf_files="/etc/nvme/*.conf" -patch_args=-Np0 post_install() { # these files are touch'd by install, remove so they aren't registered diff --git a/srcpkgs/nwipe/patches/0001-musl-build-fix.patch b/srcpkgs/nwipe/patches/0001-musl-build-fix.patch index 6d209269cde..90e12ea50ea 100644 --- a/srcpkgs/nwipe/patches/0001-musl-build-fix.patch +++ b/srcpkgs/nwipe/patches/0001-musl-build-fix.patch @@ -10,8 +10,8 @@ musl does not have bits/sigthread.h diff --git src/nwipe.c src/nwipe.c index 2c9c851..487177e 100644 ---- src/nwipe.c -+++ src/nwipe.c +--- a/src/nwipe.c ++++ b/src/nwipe.c @@ -32,7 +32,9 @@ #include #include diff --git a/srcpkgs/nwipe/template b/srcpkgs/nwipe/template index 5b88dfcd2d9..e3cbc2b3b65 100644 --- a/srcpkgs/nwipe/template +++ b/srcpkgs/nwipe/template @@ -11,7 +11,6 @@ license="GPL-2.0-only" homepage="https://github.com/martijnvanbrummelen/nwipe" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=85faaa9c65557a6be187f0176c5b778e8cd080e1cd9b8a7168a8a9b8e410d46d -patch_args=-Np0 CFLAGS="-D_FILE_OFFSET_BITS=64" diff --git a/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch b/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch index 3f51b8e4b1a..4b6a5f4a55a 100644 --- a/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch +++ b/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch @@ -1,5 +1,5 @@ ---- ./nx-X11/extras/Mesa/src/mesa/main/glheader.h.orig -+++ ./nx-X11/extras/Mesa/src/mesa/main/glheader.h +--- a/nx-X11/extras/Mesa/src/mesa/main/glheader.h ++++ b/nx-X11/extras/Mesa/src/mesa/main/glheader.h @@ -62,7 +62,7 @@ #include #include diff --git a/srcpkgs/nx-libs/patches/xf86bigfont.patch b/srcpkgs/nx-libs/patches/xf86bigfont.patch index b5f29e49337..c7591a2d972 100644 --- a/srcpkgs/nx-libs/patches/xf86bigfont.patch +++ b/srcpkgs/nx-libs/patches/xf86bigfont.patch @@ -1,5 +1,5 @@ ---- nx-X11/programs/Xserver/Xext/xf86bigfont.c 2021-02-04 14:34:56.000000000 +0100 -+++ - 2021-05-10 08:55:11.108944904 +0200 +--- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2021-02-04 14:34:56.000000000 +0100 ++++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c 2021-02-04 14:34:56.000000000 +0100 @@ -45,7 +45,6 @@ /* Linux libc4 and libc5 only (because glibc doesn't include kernel headers): Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template index 108696f69aa..f604983c82c 100644 --- a/srcpkgs/nx-libs/template +++ b/srcpkgs/nx-libs/template @@ -22,7 +22,6 @@ checksum=3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357 python_version=3 nocross="imake attempts to run target executables on host" conf_files="/etc/nxagent/*" -patch_args=-Np0 post_patch() { # Replace hard-coded /usr/local ProjectRoot