summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/coreutils/Pkgfile.patch31
-rw-r--r--core/coreutils/coreutils-shred.patch.new28
-rw-r--r--core/coreutils/coreutils-uniq.patch.new52
-rw-r--r--core/curl/with-ca-path.Pkgfile.patch12
-rw-r--r--core/pkgutils/Pkgfile-apply-patch1.patch6
-rw-r--r--core/pkgutils/Pkgfile-apply-patch2.patch4
-rw-r--r--core/pkgutils/pkgmk-permissions-test.patch.new8
-rw-r--r--core/ports/post_update_patches.Pkgfile.patch18
-rw-r--r--opt/nss/with-clang.Pkgfile.patch12
9 files changed, 91 insertions, 80 deletions
diff --git a/core/coreutils/Pkgfile.patch b/core/coreutils/Pkgfile.patch
index ab56def..9396a74 100644
--- a/core/coreutils/Pkgfile.patch
+++ b/core/coreutils/Pkgfile.patch
@@ -1,20 +1,19 @@
---- Pkgfile 2016-01-21 19:54:43.219280408 +0100
-+++ Pkgfile 2016-10-05 21:31:50.026261183 +0200
-@@ -7,12 +7,16 @@
- version=8.27
+--- Pkgfile 2022-04-25 20:51:04.460709414 +0200
++++ Pkgfile 2022-04-25 20:53:04.800488403 +0200
+@@ -6,11 +6,15 @@
+ name=coreutils
+ version=9.1
release=1
- source=(http://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz
-- coreutils-uname.patch)
-+ coreutils-shred.patch
-+ coreutils-uname.patch
-+ coreutils-uniq.patch)
+-source=(https://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz)
++source=(https://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz
++ coreutils-shred.patch
++ coreutils-uniq.patch)
build() {
- cd $name-$version
+ cd $name-$version
-+ patch -p1 -i $SRC/coreutils-shred.patch
- patch -p1 -i $SRC/coreutils-uname.patch
-+ patch -p1 -i $SRC/coreutils-uniq.patch
- export FORCE_UNSAFE_CONFIGURE=1
-
- ./configure --prefix=/usr \
++ patch -p1 -i $SRC/coreutils-shred.patch
++ patch -p1 -i $SRC/coreutils-uniq.patch
+ FORCE_UNSAFE_CONFIGURE=1 \
+ ./configure \
+ --prefix=/usr \
diff --git a/core/coreutils/coreutils-shred.patch.new b/core/coreutils/coreutils-shred.patch.new
index bcbc4b9..44a6102 100644
--- a/core/coreutils/coreutils-shred.patch.new
+++ b/core/coreutils/coreutils-shred.patch.new
@@ -1,5 +1,5 @@
---- old/src/shred.c 2016-12-16 14:36:58.819399157 +0100
-+++ new/src/shred.c 2016-12-16 14:35:27.590639035 +0100
+--- old/src/shred.c 2023-10-26 22:09:37.015120384 +0200
++++ new/src/shred.c 2023-10-26 22:09:18.888454497 +0200
@@ -129,6 +129,7 @@
struct Options
{
@@ -10,12 +10,12 @@
enum remove_method remove_file; /* -u flag: remove file after shredding */
@@ -148,6 +149,7 @@
{
- {"exact", no_argument, NULL, 'x'},
- {"force", no_argument, NULL, 'f'},
-+ {"shred-hard-links", no_argument, NULL, 'h'},
- {"iterations", required_argument, NULL, 'n'},
- {"size", required_argument, NULL, 's'},
- {"random-source", required_argument, NULL, RANDOM_SOURCE_OPTION},
+ {"exact", no_argument, nullptr, 'x'},
+ {"force", no_argument, nullptr, 'f'},
++ {"shred-hard-links", no_argument, nullptr, 'h'},
+ {"iterations", required_argument, nullptr, 'n'},
+ {"size", required_argument, nullptr, 's'},
+ {"random-source", required_argument, nullptr, RANDOM_SOURCE_OPTION},
@@ -180,6 +182,7 @@
printf (_("\
@@ -24,7 +24,7 @@
-n, --iterations=N overwrite N times instead of the default (%d)\n\
--random-source=FILE get random bytes from FILE\n\
-s, --size=N shred this many bytes (suffixes like K, M, G accepted)\n\
-@@ -891,6 +894,11 @@
+@@ -850,6 +853,11 @@
error (0, 0, _("%s: file has negative size"), qname);
return false;
}
@@ -36,7 +36,7 @@
/* Allocate pass array */
passarray = xnmalloc (flags->n_iterations, sizeof *passarray);
-@@ -1218,7 +1226,7 @@
+@@ -1163,7 +1171,7 @@
main (int argc, char **argv)
{
bool ok = true;
@@ -45,16 +45,16 @@
char **file;
int n_files;
int c;
-@@ -1236,7 +1244,7 @@
+@@ -1181,7 +1189,7 @@
flags.n_iterations = DEFAULT_PASSES;
flags.size = -1;
-- while ((c = getopt_long (argc, argv, "fn:s:uvxz", long_opts, NULL)) != -1)
-+ while ((c = getopt_long (argc, argv, "fhn:s:uvxz", long_opts, NULL)) != -1)
+- while ((c = getopt_long (argc, argv, "fn:s:uvxz", long_opts, nullptr)) != -1)
++ while ((c = getopt_long (argc, argv, "fhn:s:uvxz", long_opts, nullptr)) != -1)
{
switch (c)
{
-@@ -1244,6 +1252,10 @@
+@@ -1189,6 +1197,10 @@
flags.force = true;
break;
diff --git a/core/coreutils/coreutils-uniq.patch.new b/core/coreutils/coreutils-uniq.patch.new
index 9acb2d7..d690cf6 100644
--- a/core/coreutils/coreutils-uniq.patch.new
+++ b/core/coreutils/coreutils-uniq.patch.new
@@ -1,6 +1,6 @@
---- old/src/uniq.c 2016-10-05 20:45:05.445188226 +0200
-+++ new/src/uniq.c 2016-10-05 21:25:24.298871811 +0200
-@@ -58,6 +58,9 @@
+--- old/src/uniq.c 2023-10-26 22:16:06.128439677 +0200
++++ new/src/uniq.c 2023-10-26 22:15:43.965104621 +0200
+@@ -51,6 +51,9 @@
/* Number of fields to skip on each line when doing comparisons. */
static size_t skip_fields;
@@ -10,15 +10,15 @@
/* Number of chars to skip after skipping any fields. */
static size_t skip_chars;
-@@ -153,6 +156,7 @@
- {"ignore-case", no_argument, NULL, 'i'},
- {"unique", no_argument, NULL, 'u'},
- {"skip-fields", required_argument, NULL, 'f'},
-+ {"check-fields", required_argument, NULL, 'm'},
- {"skip-chars", required_argument, NULL, 's'},
- {"check-chars", required_argument, NULL, 'w'},
- {"zero-terminated", no_argument, NULL, 'z'},
-@@ -200,6 +204,11 @@
+@@ -146,6 +149,7 @@
+ {"ignore-case", no_argument, nullptr, 'i'},
+ {"unique", no_argument, nullptr, 'u'},
+ {"skip-fields", required_argument, nullptr, 'f'},
++ {"check-fields", required_argument, nullptr, 'm'},
+ {"skip-chars", required_argument, nullptr, 's'},
+ {"check-chars", required_argument, nullptr, 'w'},
+ {"zero-terminated", no_argument, nullptr, 'z'},
+@@ -193,6 +197,11 @@
"), stdout);
fputs (_("\
-i, --ignore-case ignore differences in case when comparing\n\
@@ -30,16 +30,16 @@
-s, --skip-chars=N avoid comparing the first N characters\n\
-u, --unique only print unique lines\n\
"), stdout);
-@@ -260,7 +269,7 @@
- return a pointer to the beginning of the line's field to be compared. */
+@@ -252,7 +261,7 @@
- static char * _GL_ATTRIBUTE_PURE
+ ATTRIBUTE_PURE
+ static char *
-find_field (struct linebuffer const *line)
+find_field (struct linebuffer const *line, size_t *len)
{
size_t count;
char const *lp = line->buffer;
-@@ -277,6 +286,21 @@
+@@ -269,6 +278,21 @@
i += MIN (skip_chars, size - i);
@@ -61,7 +61,7 @@
return line->buffer + i;
}
-@@ -377,8 +401,7 @@
+@@ -366,8 +390,7 @@
if (readlinebuffer_delim (thisline, stdin, delimiter) == 0)
break;
@@ -69,9 +69,9 @@
- thislen = thisline->length - 1 - (thisfield - thisline->buffer);
+ thisfield = find_field (thisline,&thislen);
- new_group = (prevline->length == 0
+ new_group = (!prevfield
|| different (thisfield, prevfield, thislen, prevlen));
-@@ -412,8 +435,7 @@
+@@ -402,8 +425,7 @@
if (readlinebuffer_delim (prevline, stdin, delimiter) == 0)
goto closefiles;
@@ -81,7 +81,7 @@
while (!feof (stdin))
{
-@@ -426,8 +448,7 @@
+@@ -416,8 +438,7 @@
goto closefiles;
break;
}
@@ -91,7 +91,7 @@
match = !different (thisfield, prevfield, thislen, prevlen);
match_count += match;
-@@ -508,6 +529,7 @@
+@@ -497,6 +518,7 @@
skip_chars = 0;
skip_fields = 0;
@@ -99,16 +99,16 @@
check_chars = SIZE_MAX;
output_unique = output_first_repeated = true;
output_later_repeated = false;
-@@ -523,7 +545,7 @@
+@@ -512,7 +534,7 @@
if (optc == -1
|| (posixly_correct && nfiles != 0)
|| ((optc = getopt_long (argc, argv,
-- "-0123456789Dcdf:is:uw:z", longopts, NULL))
-+ "-0123456789Dcdf:im:s:uw:z", longopts, NULL))
+- "-0123456789Dcdf:is:uw:z",
++ "-0123456789Dcdf:im:s:uw:z",
+ longopts, nullptr))
== -1))
{
- if (argc <= optind)
-@@ -617,6 +639,11 @@
+@@ -607,6 +629,11 @@
ignore_case = true;
break;
diff --git a/core/curl/with-ca-path.Pkgfile.patch b/core/curl/with-ca-path.Pkgfile.patch
index dbfcf37..4253b00 100644
--- a/core/curl/with-ca-path.Pkgfile.patch
+++ b/core/curl/with-ca-path.Pkgfile.patch
@@ -1,10 +1,10 @@
--- Pkgfile 2016-04-27 21:29:05.981945202 +0200
+++ Pkgfile 2016-04-27 22:49:18.883588926 +0200
-@@ -15,6 +15,7 @@
- --without-libidn2 \
- --without-cyassl \
+@@ -14,6 +14,7 @@
+ --prefix=/usr \
+ --enable-ipv6 \
--enable-threaded-resolver \
+ --with-ca-path=/etc/ssl/certs \
- --with-ca-bundle=/etc/ssl/cert.pem
- make
- make DESTDIR=$PKG install
+ --with-ca-bundle=/etc/ssl/cert.pem \
+ --with-openssl \
+ --disable-ldap{,s} \
diff --git a/core/pkgutils/Pkgfile-apply-patch1.patch b/core/pkgutils/Pkgfile-apply-patch1.patch
index 94f47fa..11f1a9a 100644
--- a/core/pkgutils/Pkgfile-apply-patch1.patch
+++ b/core/pkgutils/Pkgfile-apply-patch1.patch
@@ -2,10 +2,10 @@
+++ Pkgfile 2016-06-01 21:50:47.785297105 +0200
@@ -6,9 +6,11 @@
name=pkgutils
- version=5.40.1
+ version=5.40.10
release=1
--source=(http://crux.nu/files/$name-$version.tar.xz)
-+source=(http://crux.nu/files/$name-$version.tar.xz
+-source=(https://crux.nu/files/$name-$version.tar.xz)
++source=(https://crux.nu/files/$name-$version.tar.xz
+ PKGMK_FULL_SOURCE_MIRRORS.patch)
build () {
diff --git a/core/pkgutils/Pkgfile-apply-patch2.patch b/core/pkgutils/Pkgfile-apply-patch2.patch
index d8cddeb..b5a7381 100644
--- a/core/pkgutils/Pkgfile-apply-patch2.patch
+++ b/core/pkgutils/Pkgfile-apply-patch2.patch
@@ -1,9 +1,9 @@
--- Pkgfile 2016-06-01 21:50:22.035228588 +0200
+++ Pkgfile 2016-06-01 21:50:47.785297105 +0200
@@ -7,10 +7,12 @@
- version=5.40.1
+ version=5.40.10
release=1
- source=(http://crux.nu/files/$name-$version.tar.xz
+ source=(https://crux.nu/files/$name-$version.tar.xz
- PKGMK_FULL_SOURCE_MIRRORS.patch)
+ PKGMK_FULL_SOURCE_MIRRORS.patch
+ pkgmk-permissions-test.patch)
diff --git a/core/pkgutils/pkgmk-permissions-test.patch.new b/core/pkgutils/pkgmk-permissions-test.patch.new
index d94705a..870f0f5 100644
--- a/core/pkgutils/pkgmk-permissions-test.patch.new
+++ b/core/pkgutils/pkgmk-permissions-test.patch.new
@@ -16,7 +16,7 @@
PKGMK_DOWNLOAD_PROG=${PKGMK_DOWNLOAD_PROG:-wget}
@@ -631,10 +636,13 @@
- local FILE LOCAL_FILENAME
+ local ORIG_FILE LOCAL_FILE srcind
if [ -f $TARGET ]; then
+ check_directory "$PKGMK_PACKAGE_DIR"
@@ -26,9 +26,9 @@
+ check_directory "$PKGMK_SOURCE_DIR"
+
- for FILE in ${source[@]}; do
- LOCAL_FILENAME=`get_filename $FILE`
- if [ -e $LOCAL_FILENAME ] && [ "$LOCAL_FILENAME" != "$FILE" ]; then
+ srcind=0
+ while [ $srcind -lt ${#source[@]} ]; do
+ ORIG_FILE="${source[$srcind]}"
@@ -652,7 +660,6 @@
check_file "$PKGMK_FOOTPRINT"
diff --git a/core/ports/post_update_patches.Pkgfile.patch b/core/ports/post_update_patches.Pkgfile.patch
index 709f203..60a4b05 100644
--- a/core/ports/post_update_patches.Pkgfile.patch
+++ b/core/ports/post_update_patches.Pkgfile.patch
@@ -2,15 +2,15 @@
+++ Pkgfile 2017-02-26 22:05:04.834041199 +0100
@@ -8,11 +8,12 @@
- source=(http://crux.nu/files/tools/ports/$name-$version.tar.gz \
- core.pub opt.pub xorg.pub compat-32.pub contrib.pub \
-- core.rsync opt.rsync xorg.rsync \
-+ core.rsync opt.rsync xorg.rsync post_update_patches.patch \
- compat-32.rsync.inactive contrib.rsync.inactive)
+ source=(https://crux.nu/files/tools/ports/$name-$version.tar.gz
+ core.pub opt.pub xorg.pub compat-32.pub contrib.pub
+- core.rsync opt.rsync xorg.rsync
++ core.rsync opt.rsync xorg.rsync post_update_patches.patch
+ compat-32.rsync.inactive contrib.rsync.inactive)
build () {
- cd $name-$version
-+ patch -p0 -i $SRC/post_update_patches.patch
- make
- make DESTDIR=$PKG MANDIR=/usr/share/man install
+ cd $name-$version
++ patch -p0 -i $SRC/post_update_patches.patch
+ make
+ make DESTDIR=$PKG MANDIR=/usr/share/man install
diff --git a/opt/nss/with-clang.Pkgfile.patch b/opt/nss/with-clang.Pkgfile.patch
new file mode 100644
index 0000000..363b417
--- /dev/null
+++ b/opt/nss/with-clang.Pkgfile.patch
@@ -0,0 +1,12 @@
+--- Pkgfile 2023-06-13 11:48:18.999668961 +0200
++++ Pkgfile 2023-06-30 14:52:07.427227828 +0200
+@@ -15,6 +15,9 @@
+
+ patch -Np1 -i $SRC/nss-3.54-standalone-2.patch
+
++ export CC=clang
++ export CXX=clang++
++
+ export NSPR_INCLUDE_DIR=/usr/include/nspr
+ export NSPR_LIB_DIR=/usr/lib
+ export NSS_USE_SYSTEM_SQLITE=1
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 07:52:37 +0000