summaryrefslogtreecommitdiff
path: root/sysutils/afio/files/patch-afio.c
diff options
context:
space:
mode:
authorFernando ApesteguĂ­a <fernape@FreeBSD.org>2019-04-27 15:40:45 +0000
committerFernando ApesteguĂ­a <fernape@FreeBSD.org>2019-04-27 15:40:45 +0000
commitdee33b4bb2b0734aaff4ef636fc49c5186e174f6 (patch)
tree5859608b56cf2f9321b80aa10d24d01b218f8f0f /sysutils/afio/files/patch-afio.c
parentcomms/fllog: fix build (diff)
sysutils/afio: update to 2.5.2
ChangeLog (https://github.com/kholtman/afio/blob/master/ANNOUNCE-2.5.2): * security improvements for the handling of archives from unstrusted sources * when making multivolume archives, added %V feature to include the volume number in subsequent volume file names * various bug and portability fixes PR: 237324 Submitted by: takefu@airport.fm Approved by: portmaster@bsdforge.com (maintainer, timeout 10 days)
Notes
Notes: svn path=/head/; revision=500213
Diffstat (limited to 'sysutils/afio/files/patch-afio.c')
-rw-r--r--sysutils/afio/files/patch-afio.c94
1 files changed, 11 insertions, 83 deletions
diff --git a/sysutils/afio/files/patch-afio.c b/sysutils/afio/files/patch-afio.c
index cce0a343ebcc..cc5b668e0dc9 100644
--- a/sysutils/afio/files/patch-afio.c
+++ b/sysutils/afio/files/patch-afio.c
@@ -1,83 +1,11 @@
-*** afio.c.orig Sat Dec 20 17:16:13 2003
---- afio.c Sat Jan 21 17:31:23 2006
-***************
-*** 648,658 ****
- daniel.andersson@sto.sema.se */
- fprintf (stderr, "Media size %ld is less than block size %d\n",
- aruntil, arbsize);
- #else
- fprintf (stderr, "Media size %ld is less than block size %d\n",
-! (unsigned long) aruntil, arbsize);
- #endif
- usage ();
- }
- if (arpad == 0)
- arpad = arbsize;
---- 648,658 ----
- daniel.andersson@sto.sema.se */
- fprintf (stderr, "Media size %ld is less than block size %d\n",
- aruntil, arbsize);
- #else
- fprintf (stderr, "Media size %ld is less than block size %d\n",
-! (u_long) aruntil, arbsize);
- #endif
- usage ();
- }
- if (arpad == 0)
- arpad = arbsize;
-***************
-*** 3155,3168 ****
- return (warn (name, syserr ()));
- else
- exists = 0;
- }
-
-! if (mknod (name, asb->sb_mode, asb->sb_rdev) < 0
- && (errno != ENOENT
- || dirneed (name) < 0
-! || mknod (name, asb->sb_mode, asb->sb_rdev) < 0))
- return (warn (name, syserr ()));
- break;
- case S_IFDIR:
- if (exists)
- {
---- 3155,3168 ----
- return (warn (name, syserr ()));
- else
- exists = 0;
- }
-
-! if (mkfifo (name, asb->sb_mode) < 0
- && (errno != ENOENT
- || dirneed (name) < 0
-! || mkfifo (name, asb->sb_mode) < 0))
- return (warn (name, syserr ()));
- break;
- case S_IFDIR:
- if (exists)
- {
-***************
-*** 3194,3204 ****
- || dirneed (name) < 0
- || mkfifo (name, asb->sb_mode) < 0))
- return (warn (name, syserr ()));
- break;
- #endif /* S_IFIFO */
-! #ifdef S_IFSOCK
- case S_IFSOCK:
- fd = 0;
- if (exists)
- if (perm != operm && chmod (name, perm) < 0)
- return (warn (name, syserr ()));
---- 3194,3204 ----
- || dirneed (name) < 0
- || mkfifo (name, asb->sb_mode) < 0))
- return (warn (name, syserr ()));
- break;
- #endif /* S_IFIFO */
-! #ifdef S_IFSOCK && !defined (__FreeBSD__)
- case S_IFSOCK:
- fd = 0;
- if (exists)
- if (perm != operm && chmod (name, perm) < 0)
- return (warn (name, syserr ()));
+--- afio.c.orig 2018-11-30 14:25:04 UTC
++++ afio.c
+@@ -3423,7 +3423,7 @@ openotty (name, asb, linkp, ispass, dozf
+ return (warn (name, syserr ()));
+ break;
+ #endif /* S_IFIFO */
+-#ifdef S_IFSOCK
++#ifdef S_IFSOCK && !defined (__FreeBSD__)
+ case S_IFSOCK:
+ fd = 0;
+ if (exists)