pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/sfslite Make this build.
details: https://anonhg.NetBSD.org/pkgsrc/rev/73246cb989d3
branches: trunk
changeset: 367992:73246cb989d3
user: dholland <dholland%pkgsrc.org@localhost>
date: Sat Sep 09 19:45:46 2017 +0000
description:
Make this build.
diffstat:
devel/sfslite/distinfo | 15 ++-
devel/sfslite/patches/patch-aa | 40 +++++++-
devel/sfslite/patches/patch-async_aio.C | 119 ++++++++++++++++++++++++++
devel/sfslite/patches/patch-async_daemonize.C | 93 ++++++++++++++++++++
devel/sfslite/patches/patch-async_dns.C | 40 ++++++++
devel/sfslite/patches/patch-async_dnsparse.C | 25 +++++
devel/sfslite/patches/patch-async_ifchg.C | 23 +++++
devel/sfslite/patches/patch-async_ihash.C | 15 +++
devel/sfslite/patches/patch-async_ihash.h | 57 ++++++++++++-
devel/sfslite/patches/patch-async_myname.C | 23 +++++
devel/sfslite/patches/patch-configure | 17 +++
devel/sfslite/patches/patch-configure.in | 15 +++
12 files changed, 472 insertions(+), 10 deletions(-)
diffs (truncated from 559 to 300 lines):
diff -r 464110db600f -r 73246cb989d3 devel/sfslite/distinfo
--- a/devel/sfslite/distinfo Sat Sep 09 18:42:20 2017 +0000
+++ b/devel/sfslite/distinfo Sat Sep 09 19:45:46 2017 +0000
@@ -1,15 +1,24 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:29:32 agc Exp $
+$NetBSD: distinfo,v 1.6 2017/09/09 19:45:46 dholland Exp $
SHA1 (sfslite-1.2.7.tar.gz) = 774c1defc74d9f354622f60aa5c038400b401c5b
RMD160 (sfslite-1.2.7.tar.gz) = 3e72a4d6cb0975c13b51f13ff615e8a390c36e3b
SHA512 (sfslite-1.2.7.tar.gz) = b2cd6d60a4349bdc54d973656fffdad9e4a4304dfa0cc8e27584e65bdd1359c2bd2be9552bd42fdd89475929b793509dd01589afe4cb72bb8ba14fca36ccb171
Size (sfslite-1.2.7.tar.gz) = 1379432 bytes
-SHA1 (patch-aa) = 9c13092b1fe5e9d7c25eea9293fadbbaab096299
+SHA1 (patch-aa) = fa1f4a82d0d97375dafa972049aedc7ac0e80885
SHA1 (patch-ab) = 0bfc67711150e5dc8eb74fba29e9abd5272e62db
SHA1 (patch-ac) = 88294e8dc9785a68019f66d0513c6d043a6b9f2e
-SHA1 (patch-async_ihash.h) = 6ae910ad516739f04f0fd29849912c8eb457eca2
+SHA1 (patch-async_aio.C) = e35510da5504d401f9fdac6b9cb296bdb4f9b703
+SHA1 (patch-async_daemonize.C) = db816068eaee9c0096234795c725925ced6133ca
+SHA1 (patch-async_dns.C) = 6eb8ef8a772a6a83942d4335fd126717dae6e805
+SHA1 (patch-async_dnsparse.C) = 77dce63d143882a3fd531a78ef0a5b8edc48de1f
+SHA1 (patch-async_ifchg.C) = f941daa091908612a783bba57dbcf3bf92db3aaa
+SHA1 (patch-async_ihash.C) = 6365eadd3da6e765766f529311d58043a9b108ec
+SHA1 (patch-async_ihash.h) = 027b7b270804ebf11ba1d2e5b7ac26a025abfcda
SHA1 (patch-async_itree.h) = a777c376d2e8ac2a4ffdd84ec319325edc2ebb9b
+SHA1 (patch-async_myname.C) = 0530b7a4bf43e99ff6a2ade6846db6af15fe4e6d
SHA1 (patch-async_qhash.h) = c145936da65369dce93092df3535e6fad921d030
SHA1 (patch-async_rwfd_c) = be0075129d6bfe3eda7f86721a8a977acd5296d2
SHA1 (patch-async_vec.h) = 6f73867864f650de1c760228fc2f39f951554df5
+SHA1 (patch-configure) = 5fbf91e7b0d215a724814c36a55110df0f3409b8
+SHA1 (patch-configure.in) = a0f282d9a5fcd9843be8373ebe55511f8c9cad23
SHA1 (patch-libsafeptr_sp__gc.h) = 1194e270b3869b26fce2f2fb6680f599a5dc675e
diff -r 464110db600f -r 73246cb989d3 devel/sfslite/patches/patch-aa
--- a/devel/sfslite/patches/patch-aa Sat Sep 09 18:42:20 2017 +0000
+++ b/devel/sfslite/patches/patch-aa Sat Sep 09 19:45:46 2017 +0000
@@ -1,10 +1,29 @@
-$NetBSD: patch-aa,v 1.1.1.1 2012/05/07 07:25:55 agc Exp $
+$NetBSD: patch-aa,v 1.2 2017/09/09 19:45:46 dholland Exp $
-Old C++ warning
+Clean up %m abuse.
+XXX: third hunk's purpose is unknown.
---- async/myaddrs.C 2012/03/28 12:41:30 1.1
-+++ async/myaddrs.C 2012/03/28 12:42:18
-@@ -74,7 +74,7 @@
+--- async/myaddrs.C.orig 2009-02-12 13:20:42.000000000 +0000
++++ async/myaddrs.C
+@@ -41,7 +41,7 @@ myipaddrs (vec<in_addr> *res)
+ int s;
+
+ if ((s = socket (AF_INET, SOCK_DGRAM, 0)) < 0) {
+- warn ("socket: %m\n");
++ warn ("socket: %s\n", strerror(errno));
+ return false;
+ }
+
+@@ -53,7 +53,7 @@ myipaddrs (vec<in_addr> *res)
+ xfree (ifc.ifc_buf);
+ ifc.ifc_buf = (char *) xmalloc (ifc.ifc_len);
+ if (ioctl (s, SIOCGIFCONF, &ifc) < 0) {
+- warn ("SIOCGIFCONF: %m\n");
++ warn ("SIOCGIFCONF: %s\n", strerror(errno));
+ close (s);
+ xfree (ifc.ifc_buf);
+ return false;
+@@ -74,7 +74,7 @@ myipaddrs (vec<in_addr> *res)
res->clear ();
bhash<in_addr> addrs;
@@ -13,3 +32,14 @@
e = p + ifc.ifc_len;
while (p < e) {
struct ifreq *ifrp = (struct ifreq *) p;
+@@ -88,8 +88,8 @@ myipaddrs (vec<in_addr> *res)
+ if (ifrp->ifr_addr.sa_family != AF_INET)
+ continue;
+ if (ioctl (s, SIOCGIFFLAGS, &ifr) < 0) {
+- warn ("SIOCGIFFLAGS (%.*s): %m\n", (int) sizeof (ifr.ifr_name),
+- ifr.ifr_name);
++ warn ("SIOCGIFFLAGS (%.*s): %s\n", (int) sizeof (ifr.ifr_name),
++ ifr.ifr_name, strerror(errno));
+ continue;
+ }
+ in_addr a = ((struct sockaddr_in *) &ifrp->ifr_addr)->sin_addr;
diff -r 464110db600f -r 73246cb989d3 devel/sfslite/patches/patch-async_aio.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/sfslite/patches/patch-async_aio.C Sat Sep 09 19:45:46 2017 +0000
@@ -0,0 +1,119 @@
+$NetBSD: patch-async_aio.C,v 1.1 2017/09/09 19:45:46 dholland Exp $
+
+Clean up %m abuse.
+
+--- async/aio.C~ 2009-02-12 13:20:42.000000000 +0000
++++ async/aio.C
+@@ -21,6 +21,7 @@
+ *
+ */
+
++#include <cstring>
+ #include "aiod.h"
+
+ aiobuf::aiobuf (aiod *d, size_t p, size_t l)
+@@ -62,7 +63,7 @@ aiod::writeq::output ()
+ wbuf.copyout (buf, wsize);
+ ssize_t n = write (wfd, buf, wsize);
+ if (n < 0)
+- fatal ("write to aiod failed (%m)\n"); // XXX - should make aiod fail
++ fatal ("write to aiod failed (%s)\n", strerror(errno)); // XXX - should make aiod fail
+ wbuf.rembytes (n);
+ if (!wbuf.resid ())
+ fdcb (wfd, selwrite, NULL);
+@@ -81,7 +82,7 @@ aiod::writeq::sendmsg (aiomsg_t msg)
+ else {
+ ssize_t n = write (wfd, &msg, sizeof (msg));
+ if (n < 0)
+- fatal ("write to aiod failed (%m)\n");
++ fatal ("write to aiod failed (%s)\n", strerror(errno));
+ if (n != sizeof (msg)) {
+ // Writes less than PIPE_BUF were supposed to be atomic
+ warn ("aiod::writeq::sendmsg: partial write (%d bytes)\n", (int) n);
+@@ -98,7 +99,7 @@ aiod::daemon::launch (str path, int shmf
+
+ int fds[2];
+ if (socketpair (AF_UNIX, SOCK_STREAM, 0, fds) < 0)
+- fatal ("aiod::daemon::launch: socketpair failed: %m\n");
++ fatal ("aiod::daemon::launch: socketpair failed: %s\n", strerror(errno));
+ wq.wfd = fd = fds[0];
+ close_on_exec (fd);
+
+@@ -166,24 +167,24 @@ aiod::aiod (u_int nproc, ssize_t shmsize
+ xfree (temp);
+ }
+ if (!tmpfile)
+- fatal ("aiod: could not create temporary file: %m\n");
++ fatal ("aiod: could not create temporary file: %s\n", strerror(errno));
+ umask (m);
+ close_on_exec (shmfd);
+ if (ftruncate (shmfd, shmmax) < 0)
+- fatal ("aiod: could not grow shared mem file (%m)\n");
++ fatal ("aiod: could not grow shared mem file (%s)\n", strerror(errno));
+ struct stat sb;
+ if (fstat (shmfd, &sb) < 0)
+- fatal ("fstat (%s): %m\n", tmpfile.cstr ());
++ fatal ("fstat (%s): %s\n", tmpfile.cstr (), strerror(errno));
+
+ shmbuf = static_cast<char *>
+ (mmap (NULL, (size_t) shmmax, PROT_READ|PROT_WRITE,
+ MAP_FILE|MAP_SHARED, shmfd, 0));
+ if (shmbuf == (char *) MAP_FAILED)
+- fatal ("aiod: could not mmap shared mem file (%m)\n");
++ fatal ("aiod: could not mmap shared mem file (%s)\n", strerror(errno));
+
+ int fds[2];
+ if (pipe (fds) < 0)
+- fatal ("aiod: pipe syscall failed: %m\n");
++ fatal ("aiod: pipe syscall failed: %s\n", strerror(errno));
+ wq.wfd = fds[1];
+ close_on_exec (wq.wfd);
+ int rfd = fds[0];
+@@ -201,10 +202,10 @@ aiod::aiod (u_int nproc, ssize_t shmsize
+ * wherever possible we use flock as it is faster.) */
+ int fd = ::open (tmpfile, O_RDWR);
+ if (fd < 0)
+- fatal ("cannot reopen %s: %m\n", tmpfile.cstr ());
++ fatal ("cannot reopen %s: %s\n", tmpfile.cstr (), strerror(errno));
+ struct stat sb2;
+ if (fstat (fd, &sb2) < 0)
+- fatal ("fstat (%s): %m\n", tmpfile.cstr ());
++ fatal ("fstat (%s): %s\n", tmpfile.cstr (), strerror(errno));
+ if (sb.st_dev != sb2.st_dev || sb.st_ino != sb2.st_ino)
+ fatal ("aiod: somone tampered with %s\n", tmpfile.cstr ());
+
+@@ -223,14 +224,14 @@ aiod::aiod (u_int nproc, ssize_t shmsize
+ * consuming disk space to make sure it gets garbage collected
+ * properly. */
+ if (::unlink (tmpfile) < 0)
+- fatal ("aiod: unlink (%s): %m\n", tmpfile.cstr ());
++ fatal ("aiod: unlink (%s): %s\n", tmpfile.cstr (), strerror(errno));
+ }
+
+ aiod::~aiod ()
+ {
+ fail ();
+ if (munmap (shmbuf, shmlen) < 0)
+- warn ("~aiod could not unmap shared mem: %m\n");
++ warn ("~aiod could not unmap shared mem: %s\n", strerror(errno));
+ close (shmfd);
+ delete[] dv;
+ }
+@@ -267,7 +268,7 @@ aiod::input (int i)
+ ssize_t n = read (dv[i].fd, buf, sizeof (buf));
+ if (n <= 0) {
+ if (n < 0)
+- warn ("aiod: read: %m\n");
++ warn ("aiod: read: %s\n", strerror(errno));
+ else
+ warn ("aiod: EOF\n");
+ fail ();
+@@ -469,7 +470,7 @@ aiod::bufalloc_cb2 (size_t inc, ptr<aiob
+ bb.settotsize (shmlen + inc);
+ shmlen = bb.gettotsize ();
+ if (shmpin && mlock (shmbuf + oshmlen, shmlen - oshmlen) < 0)
+- warn ("could not pin aiod shared memory: %m\n");
++ warn ("could not pin aiod shared memory: %s\n", strerror(errno));
+ bufwake ();
+ }
+ }
diff -r 464110db600f -r 73246cb989d3 devel/sfslite/patches/patch-async_daemonize.C
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/sfslite/patches/patch-async_daemonize.C Sat Sep 09 19:45:46 2017 +0000
@@ -0,0 +1,93 @@
+$NetBSD: patch-async_daemonize.C,v 1.1 2017/09/09 19:45:46 dholland Exp $
+
+Clean up %m abuse.
+
+--- async/daemonize.C~ 2009-02-12 13:20:42.000000000 +0000
++++ async/daemonize.C
+@@ -21,6 +21,7 @@
+ *
+ */
+
++#include <cstring>
+ #include "async.h"
+
+ str syslog_priority ("daemon.notice");
+@@ -31,7 +32,7 @@ start_log_to_file (const str &line, cons
+ int fd;
+ int n;
+ if ((fd = open (logfile.cstr (), flags, m)) < 0) {
+- warn ("%s: %m\n", logfile.cstr ());
++ warn ("%s: %s\n", logfile.cstr (), strerror(errno));
+ fd = errfd;
+ } else {
+ warn << "Logging via logfile: " << logfile << "\n";
+@@ -65,7 +66,7 @@ start_logger (const str &priority, const
+ pid_t pid;
+ int status;
+ if ((pid = spawn (PATH_LOGGER, av, 0, 0, errfd)) < 0) {
+- warn ("%s: %m\n", PATH_LOGGER);
++ warn ("%s: %s\n", PATH_LOGGER, strerror(errno));
+ return start_log_to_file (line, logfile, flags, mode);
+ }
+ if (waitpid (pid, &status, 0) <= 0 || !WIFEXITED (status) ||
+@@ -74,7 +75,7 @@ start_logger (const str &priority, const
+
+ int fds[2];
+ if (socketpair (AF_UNIX, SOCK_STREAM, 0, fds) < 0)
+- fatal ("socketpair: %m\n");
++ fatal ("socketpair: %s\n", strerror(errno));
+ close_on_exec (fds[0]);
+ if (fds[1] != 0)
+ close_on_exec (fds[1]);
+@@ -84,7 +85,7 @@ start_logger (const str &priority, const
+ close (fds[1]);
+ return fds[0];
+ } else
+- warn ("%s: %m\n", PATH_LOGGER);
++ warn ("%s: %s\n", PATH_LOGGER, strerror(errno));
+ #endif /* PATH_LOGGER */
+ return start_log_to_file (line, logfile, flags, mode);
+ }
+@@ -103,7 +104,7 @@ start_logger ()
+ close (fd);
+
+ if (socketpair (AF_UNIX, SOCK_STREAM, 0, fds) < 0)
+- fatal ("socketpair: %m\n");
++ fatal ("socketpair: %s\n", strerror(errno));
+ close_on_exec (fds[0]);
+ if (fds[1] != 0)
+ close_on_exec (fds[1]);
+@@ -113,7 +114,7 @@ start_logger ()
+ if (fds[0] != errfd) {
+ err_flush (); // XXX - we shouldn't depend on aerr.C
+ if (dup2 (fds[0], errfd) < 0)
+- fatal ("dup2: %m\n");
++ fatal ("dup2: %s\n", strerror(errno));
+ close (fds[0]);
+ }
+ if (errfd != 1)
+@@ -121,7 +122,7 @@ start_logger ()
+ return;
+ }
+ else
+- warn ("%s: %m\n", PATH_LOGGER);
++ warn ("%s: %s\n", PATH_LOGGER, strerror(errno));
+ #endif /* PATH_LOGGER */
+
+ /* No logger, at least send chatter to stdout rather than stderr, so
+@@ -161,13 +162,13 @@ daemonize (const str &nm)
+ default:
+ _exit (0);
+ case -1:
+- fatal ("fork: %m\n");
++ fatal ("fork: %s\n", strerror(errno));
+ case 0:
+ break;
+ }
+
+ if (setsid () == -1)
+- fatal ("setsid: %m\n");
Home |
Main Index |
Thread Index |
Old Index