summaryrefslogtreecommitdiff
path: root/archivers/star/patches
diff options
context:
space:
mode:
Diffstat (limited to 'archivers/star/patches')
-rw-r--r--archivers/star/patches/patch-aa19
-rw-r--r--archivers/star/patches/patch-ab12
-rw-r--r--archivers/star/patches/patch-ac15
-rw-r--r--archivers/star/patches/patch-ad64
-rw-r--r--archivers/star/patches/patch-ae27
-rw-r--r--archivers/star/patches/patch-af19
-rw-r--r--archivers/star/patches/patch-lib_fexec.c29
-rw-r--r--archivers/star/patches/patch-star_fflags.c14
-rw-r--r--archivers/star/patches/patch-star_star__unix.c14
9 files changed, 0 insertions, 213 deletions
diff --git a/archivers/star/patches/patch-aa b/archivers/star/patches/patch-aa
deleted file mode 100644
index 29cefc75625..00000000000
--- a/archivers/star/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/09/25 06:35:49 cjep Exp $
-
---- RULES/mk-gmake.id.orig Sun Dec 6 12:51:19 1998
-+++ RULES/mk-gmake.id Tue Sep 24 21:07:24 2002
-@@ -44,8 +44,14 @@
- XK_ARCH:= $(shell uname -m | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
- XM_ARCH:= $(shell $(_ARCHCMD) | tr '[A-Z]' '[a-z]' | tr ', /\\()"' ',//////' | tr ',/' ',-')
-
-+__OS:= $(shell uname -s)
-+
- P_ARCH= $(XP_ARCH)
-+ifeq ($(__OS),NetBSD)
-+K_ARCH= $(XP_ARCH)
-+else
- K_ARCH= $(XK_ARCH)
-+endif
- M_ARCH= $(XM_ARCH)
-
- _XP_ARCH= $(XP_ARCH:unknown=$(K_ARCH))
diff --git a/archivers/star/patches/patch-ab b/archivers/star/patches/patch-ab
deleted file mode 100644
index e4807faa90e..00000000000
--- a/archivers/star/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/05/02 22:26:12 danw Exp $
-
---- DEFAULTS/Defaults.darwin.orig Sun May 2 17:01:01 2004
-+++ DEFAULTS/Defaults.darwin
-@@ -34,5 +34,5 @@ DEFUMASK= 002
- #
- DEFINSMODEF= 444
- DEFINSMODEX= 755
--DEFINSUSR= bin
--DEFINSGRP= bin
-+DEFINSUSR= root
-+DEFINSGRP= wheel
diff --git a/archivers/star/patches/patch-ac b/archivers/star/patches/patch-ac
deleted file mode 100644
index df6383ba123..00000000000
--- a/archivers/star/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/12/30 17:25:42 cjep Exp $
-
---- RULES/rules.man.orig 1997-02-11 11:49:27.000000000 +0000
-+++ RULES/rules.man
-@@ -20,7 +20,9 @@
- # along with this program; see the file COPYING. If not, write to
- # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- ###########################################################################
--include $(SRCROOT)/$(RULESDIR)/man-$(MANSTYLE).def
-+#include $(SRCROOT)/$(RULESDIR)/man-$(MANSTYLE).def
-+# Pkgsrc owns everything under PREFIX so use BSD-style man pages
-+include $(SRCROOT)/$(RULESDIR)/man-bsd.def
- ###########################################################################
-
- INSDIR= $(MANDIR)/$(MANSECT)
diff --git a/archivers/star/patches/patch-ad b/archivers/star/patches/patch-ad
deleted file mode 100644
index 6f4ba10cb69..00000000000
--- a/archivers/star/patches/patch-ad
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2010/09/28 17:50:07 tnn Exp $
-
---- star/extract.c.orig 2002-05-02 20:02:41.000000000 +0000
-+++ star/extract.c
-@@ -92,6 +92,7 @@ EXPORT int xt_file __PR((FINFO * info,
- int (*)(void *, char *, int),
- void *arg, int amt, char* text));
- EXPORT void skip_slash __PR((FINFO * info));
-+LOCAL BOOL has_dotdot __PR((char *name));
-
- EXPORT void
- extract(vhname)
-@@ -152,6 +153,12 @@ extract(vhname)
- if (is_symlink(&finfo) && same_symlink(&finfo)) {
- continue;
- }
-+ if (!interactive && has_dotdot(finfo.f_name)) {
-+ errmsgno(EX_BAD, "'%s' contains '..', skipping ...\n",
-+ finfo.f_name);
-+ void_file(&finfo);
-+ return;
-+ }
- if (interactive && !ia_change(ptb, &finfo)) {
- if (!nflag)
- fprintf(vpr, "Skipping ...\n");
-@@ -169,6 +176,12 @@ extract(vhname)
- if (!make_dir(&finfo))
- continue;
- } else if (is_link(&finfo)) {
-+ if (!interactive && has_dotdot(finfo.f_lname)) {
-+ errmsgno(EX_BAD, "'%s' contains '..', "
-+ "skipping ...\n", finfo.f_lname);
-+ void_file(&finfo);
-+ return;
-+ }
- if (!make_link(&finfo))
- continue;
- } else if (is_symlink(&finfo)) {
-@@ -830,3 +843,25 @@ skip_slash(info)
- while (info->f_lname[0] == '/')
- info->f_lname++;
- }
-+
-+LOCAL BOOL
-+has_dotdot(name)
-+ char *name;
-+{
-+ register char *p = name;
-+
-+ while (*p) {
-+ if ((p[0] == '.' && p[1] == '.') &&
-+ (p[2] == '/' || p[2] == '\0')) {
-+ return (TRUE);
-+ }
-+ do {
-+ if (*p++ == '\0')
-+ return (FALSE);
-+ } while (*p != '/');
-+ p++;
-+ while (*p && *p == '/') /* Skip multiple slashes */
-+ p++;
-+ }
-+ return (FALSE);
-+}
diff --git a/archivers/star/patches/patch-ae b/archivers/star/patches/patch-ae
deleted file mode 100644
index df55a24690f..00000000000
--- a/archivers/star/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2012/01/30 03:43:58 sbd Exp $
-
-Remove unused custom function "getline" which conflicts with getline(3)
-which is part of the POSIX standard.
-
-Rename custom function "fexecve", which conflicts with glibc's fexecve(3),
-to schily_fexecve.
-
---- include/schily.h.orig 2002-12-24 18:28:01.000000000 +0000
-+++ include/schily.h
-@@ -107,7 +107,7 @@ extern int fexecle __PR((const char *, F
- /* 6th arg not const, fexecv forces av[ac] = NULL */
- extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
- char **));
--extern int fexecve __PR((const char *, FILE *, FILE *, FILE *,
-+extern int schily_fexecve __PR((const char *, FILE *, FILE *, FILE *,
- char * const *, char * const *));
- extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
- extern int fspawnl __PR((FILE *, FILE *, FILE *,
-@@ -183,7 +183,6 @@ extern char *fillbytes __PR((void *, int
- extern char *findbytes __PR((const void *, int, char));
- extern int findline __PR((const char *, char, const char *,
- int, char **, int));
--extern int getline __PR((char *, int));
- extern int getstr __PR((char *, int));
- extern int breakline __PR((char *, char, char **, int));
- extern int getallargs __PR((int *, char * const**, const char *, ...));
diff --git a/archivers/star/patches/patch-af b/archivers/star/patches/patch-af
deleted file mode 100644
index f2467424791..00000000000
--- a/archivers/star/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1 2011/01/15 17:46:01 tron Exp $
-
-Remove unused custom function "getline" which conflicts with getline(3)
-which is part of the POSIX standard.
-
---- lib/stdio/fgetline.c.orig 2000-12-03 11:19:29.000000000 +0000
-+++ lib/stdio/fgetline.c 2011-01-15 17:42:18.000000000 +0000
-@@ -62,11 +62,3 @@
-
- return (bp - buf);
- }
--
--EXPORT int
--getline(buf, len)
-- char *buf;
-- int len;
--{
-- return (fgetline(stdin, buf, len));
--}
diff --git a/archivers/star/patches/patch-lib_fexec.c b/archivers/star/patches/patch-lib_fexec.c
deleted file mode 100644
index 1252c97a70a..00000000000
--- a/archivers/star/patches/patch-lib_fexec.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-lib_fexec.c,v 1.1 2012/01/30 03:43:58 sbd Exp $
-
-Rename custom function "fexecve", which conflicts with glibc's fexecve(3),
-to schily_fexecve.
-
---- lib/fexec.c.orig 2002-06-08 16:45:11.000000000 +0000
-+++ lib/fexec.c
-@@ -161,7 +161,7 @@ int fexecle(name, in, out, err, va_alist
- } while (p != NULL);
- va_end(args);
-
-- ret = fexecve(name, in, out, err, av, env);
-+ ret = schily_fexecve(name, in, out, err, av, env);
- if (av != xav)
- free(av);
- return (ret);
-@@ -174,10 +174,10 @@ int fexecv(name, in, out, err, ac, av)
- char *av[];
- {
- av[ac] = NULL; /* force list to be null terminated */
-- return fexecve (name, in, out, err, av, environ);
-+ return schily_fexecve (name, in, out, err, av, environ);
- }
-
--int fexecve(name, in, out, err, av, env)
-+int schily_fexecve(name, in, out, err, av, env)
- const char *name;
- FILE *in, *out, *err;
- char * const av[], * const env[];
diff --git a/archivers/star/patches/patch-star_fflags.c b/archivers/star/patches/patch-star_fflags.c
deleted file mode 100644
index bb5016f40df..00000000000
--- a/archivers/star/patches/patch-star_fflags.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-star_fflags.c,v 1.1 2012/01/30 03:43:58 sbd Exp $
-
-<linux/fs.h> must be included before <linux/ext2_fs.h>
-
---- star/fflags.c.orig 2002-01-27 22:48:12.000000000 +0000
-+++ star/fflags.c
-@@ -41,6 +41,7 @@ static char sccsid[] =
- #include "starsubs.h"
- #ifdef __linux__
- #include <fctldefs.h>
-+#include <linux/fs.h>
- #include <linux/ext2_fs.h>
- #include <sys/ioctl.h>
- #endif
diff --git a/archivers/star/patches/patch-star_star__unix.c b/archivers/star/patches/patch-star_star__unix.c
deleted file mode 100644
index d5447355f46..00000000000
--- a/archivers/star/patches/patch-star_star__unix.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-star_star__unix.c,v 1.1 2012/01/30 03:43:58 sbd Exp $
-
-<linux/fs.h> must be included before <linux/ext2_fs.h>
-
---- star/star_unix.c.orig 2002-08-15 23:22:32.000000000 +0000
-+++ star/star_unix.c
-@@ -44,6 +44,7 @@ static char sccsid[] =
- #include "xutimes.h"
- #ifdef __linux__
- #include <fctldefs.h>
-+#include <linux/fs.h>
- #include <linux/ext2_fs.h>
- #include <sys/ioctl.h>
- #endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 04:51:54 +0000