diff options
| author | Koop Mast <kwm@rainbow-runner.nl> | 2017-09-06 18:49:45 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2017-09-06 18:49:45 +0800 |
| commit | fd6770ac21bfbaf4055314e3e44262e074d8043b (patch) | |
| tree | 8f22ad3a9da9504e81798d537abfeae054a0a2ea /sysutils | |
| parent | 64ff120725de745c8493211adbc64409733578ec (diff) | |
| parent | 0ab301bc3d23385e7f522873d436811aae3f2da2 (diff) | |
| download | freebsd-ports-gnome-fd6770ac21bfbaf4055314e3e44262e074d8043b.tar.gz freebsd-ports-gnome-fd6770ac21bfbaf4055314e3e44262e074d8043b.tar.zst freebsd-ports-gnome-fd6770ac21bfbaf4055314e3e44262e074d8043b.zip | |
Merge branch 'master' into gnome-3.24
Diffstat (limited to 'sysutils')
46 files changed, 1362 insertions, 254 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 75ae0bfa3e80..130ce02ddb04 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1144,6 +1144,7 @@ SUBDIR += syslog-ng37 SUBDIR += syslog-ng39 SUBDIR += syslog-ng310 + SUBDIR += syslog-ng311 SUBDIR += syslogger SUBDIR += sysrc SUBDIR += system-tools-backends @@ -1229,6 +1230,7 @@ SUBDIR += ufs_copy SUBDIR += uhidd SUBDIR += uif2iso + SUBDIR += unetbootin SUBDIR += unieject SUBDIR += uniutils SUBDIR += unquote diff --git a/sysutils/cmogstored/Makefile b/sysutils/cmogstored/Makefile index 6101edf1cb3f..968576bf0ea5 100644 --- a/sysutils/cmogstored/Makefile +++ b/sysutils/cmogstored/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://bogomips.org/cmogstored/files/ MAINTAINER= trociny@FreeBSD.org COMMENT= Alternative mogstored implementation for MogileFS -LICENSE= GPLv3 +LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_powerpc64= Does not build: internal compiler error: Segmentation fault @@ -17,12 +17,9 @@ BROKEN_powerpc64= Does not build: internal compiler error: Segmentation fault PLIST_FILES= sbin/cmogstored \ man/man1/cmogstored.1.gz -HAS_CONFIGURE= yes -CONFIGURE_ARGS+=--bindir=${PREFIX}/sbin \ - --mandir=${PREFIX}/man +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --bindir=${PREFIX}/sbin USE_RC_SUBR= cmogstored - -regression-test: build - ${MAKE} -C ${WRKSRC} check +TEST_TARGET= check .include <bsd.port.mk> diff --git a/sysutils/cmogstored/pkg-descr b/sysutils/cmogstored/pkg-descr index c0b77af019a8..16836b6130a8 100644 --- a/sysutils/cmogstored/pkg-descr +++ b/sysutils/cmogstored/pkg-descr @@ -3,4 +3,4 @@ component of MogileFS. cmogstored is implemented in C and does not use Perl at runtime. cmogstored is the only component you need to install on a MogileFS storage node. -WWW: http://bogomips.org/cmogstored/ +WWW: https://bogomips.org/cmogstored/ diff --git a/sysutils/docker-compose/Makefile b/sysutils/docker-compose/Makefile index 65cb09fa54c2..50104d36e7ea 100644 --- a/sysutils/docker-compose/Makefile +++ b/sysutils/docker-compose/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= docker-compose -PORTVERSION= 1.15.0 -PORTREVISION= 1 +PORTVERSION= 1.16.1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP diff --git a/sysutils/docker-compose/distinfo b/sysutils/docker-compose/distinfo index 1ef4c1f923d6..4bee33f83567 100644 --- a/sysutils/docker-compose/distinfo +++ b/sysutils/docker-compose/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501160057 -SHA256 (docker-compose-1.15.0.tar.gz) = af569f676c7a04a32d3fc4a72c739cb52d8b6305040295178c5388394b45e579 -SIZE (docker-compose-1.15.0.tar.gz) = 210455 +TIMESTAMP = 1504616209 +SHA256 (docker-compose-1.16.1.tar.gz) = fb46a6a2c4d193a3ff1e4d7208eea920b629c81dc92257c87f3f93095cfb0bdf +SIZE (docker-compose-1.16.1.tar.gz) = 212167 diff --git a/sysutils/docker-compose/files/patch-setup.py b/sysutils/docker-compose/files/patch-setup.py index d9550284a760..671e1cf0afac 100644 --- a/sysutils/docker-compose/files/patch-setup.py +++ b/sysutils/docker-compose/files/patch-setup.py @@ -1,13 +1,13 @@ ---- setup.py.orig 2017-07-25 23:05:03 UTC +--- setup.py.orig 2017-09-05 13:29:08 UTC +++ setup.py -@@ -34,8 +34,8 @@ install_requires = [ - 'colorama >= 0.3.7, < 0.4', +@@ -33,8 +33,8 @@ install_requires = [ + 'cached-property >= 1.2.0, < 2', 'docopt >= 0.6.1, < 0.7', 'PyYAML >= 3.10, < 4', - 'requests >= 2.6.1, != 2.11.0, < 2.12', -- 'texttable >= 0.8.1, < 0.9', +- 'texttable >= 0.9.0, < 0.10', + 'requests >= 2.6.1, != 2.11.0, < 3', -+ 'texttable >= 0.8.1, < 1', ++ 'texttable >= 0.9.0, < 1', 'websocket-client >= 0.32.0, < 1.0', - 'docker >= 2.4.2, < 3.0', + 'docker >= 2.5.1, < 3.0', 'dockerpty >= 0.4.1, < 0.5', diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index dc84b87b0866..df2fd1e8a7fe 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= duplicity -PORTVERSION= 0.7.13.1 +PORTVERSION= 0.7.14 CATEGORIES= sysutils MASTER_SITES= http://launchpad.net/duplicity/0.7-series/${PORTVERSION}/+download/ diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo index 8a04dfe9f775..8dc62fcd0e64 100644 --- a/sysutils/duplicity/distinfo +++ b/sysutils/duplicity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499458687 -SHA256 (duplicity-0.7.13.1.tar.gz) = adb8668fb10e0b0f91cb77f758d02c02bf5c02e6c4835904a82cbdab6db4bef2 -SIZE (duplicity-0.7.13.1.tar.gz) = 1553736 +TIMESTAMP = 1504215066 +SHA256 (duplicity-0.7.14.tar.gz) = 7a3eb74a2a36b004b10add2970b37cfbac0bd693d79513e6311c8e4b8c3dd73e +SIZE (duplicity-0.7.14.tar.gz) = 1556110 diff --git a/sysutils/freefilesync/Makefile b/sysutils/freefilesync/Makefile index ab800680fc02..2f2b34024bdc 100644 --- a/sysutils/freefilesync/Makefile +++ b/sysutils/freefilesync/Makefile @@ -5,8 +5,8 @@ PORTNAME= freefilesync PORTVERSION= 8.3 PORTREVISION= 5 CATEGORIES= sysutils -MASTER_SITES= http://www.freefilesync.org/download/ \ - http://www.freefilesync.org/archive/ +MASTER_SITES= https://www.freefilesync.org/download/ \ + https://www.freefilesync.org/archive/ DISTNAME= FreeFileSync_${PORTVERSION}_Source MAINTAINER= ports@FreeBSD.org diff --git a/sysutils/freefilesync/pkg-descr b/sysutils/freefilesync/pkg-descr index cb24803e0af1..e8ee2a88dbb6 100644 --- a/sysutils/freefilesync/pkg-descr +++ b/sysutils/freefilesync/pkg-descr @@ -3,4 +3,4 @@ files and synchronize folders for Windows, Linux, FreeBSD and Mac OS X. It is designed to save your time setting up and running backup jobs while having nice visual feedback along the way. -WWW: http://www.freefilesync.org/ +WWW: https://www.freefilesync.org/ diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile index bf1570523763..3b6641bfcaf2 100644 --- a/sysutils/heartbeat/Makefile +++ b/sysutils/heartbeat/Makefile @@ -3,14 +3,14 @@ PORTNAME= heartbeat PORTVERSION= 2.1.4 -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= sysutils #MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2 MASTER_SITES= LOCAL/kuriyama/heartbeat DISTNAME= STABLE-${PORTVERSION} DIST_SUBDIR= heartbeat -MAINTAINER= ports@encarnate.com +MAINTAINER= grembo@FreeBSD.org COMMENT= Subsystem for High-Availability Clustering LICENSE= GPLv2 LGPL21 @@ -54,7 +54,7 @@ CONFIGURE_ARGS= --localstatedir=/var \ --disable-dopd \ --disable-fatal-warnings -SUB_FILES= pkg-install pkg-message +SUB_FILES= pkg-message PKGDEINSTALL= ${PKGINSTALL} diff --git a/sysutils/heartbeat/files/pkg-install.in b/sysutils/heartbeat/files/pkg-install.in deleted file mode 100644 index 2cc1848d2a74..000000000000 --- a/sysutils/heartbeat/files/pkg-install.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -PREFIX=${PREFIX:-%%PREFIX%%} - -case $2 in - -DEINSTALL) - - echo -e "\n\n" - - # Check for running processes - echo -n "Checking if heartbeat is running... " - if ps -axc | grep -q heartbeat; then - echo -n "FOUND. Stopping... " - ${PREFIX}/etc/rc.d/heartbeat forcestop - echo "STOPPED" - else - echo "NO" - fi -esac diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 0a6521331801..3a156626b4a9 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -29,8 +29,6 @@ LICENSE_NAME= lsof LICENSE_FILE= ${FILESDIR}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN_powerpc64= fails to compile: sys/pcpu.h: error: size of array '__assert_0' is negative - #Please leave the below line in for the next clean up. FIXUP_RELEASE= YES .if defined(FIXUP_RELEASE) diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile index 49715c84d6ba..7a714a2349c3 100644 --- a/sysutils/nomad/Makefile +++ b/sysutils/nomad/Makefile @@ -1,19 +1,19 @@ # $FreeBSD$ PORTNAME= nomad -PORTVERSION= 0.5.6 +PORTVERSION= 0.6.1 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= jhixson@gmail.com COMMENT= Cluster manager and scheduler -LICENSE= MPL - -BUILD_DEPENDS= go>=1.8:lang/go +LICENSE= MPL20 ONLY_FOR_ARCHS= amd64 +BUILD_DEPENDS= go>=1.8:lang/go + USES= compiler USE_GITHUB= yes diff --git a/sysutils/nomad/distinfo b/sysutils/nomad/distinfo index 823d292379f1..2a7927e603bf 100644 --- a/sysutils/nomad/distinfo +++ b/sysutils/nomad/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1492544786 -SHA256 (hashicorp-nomad-v0.5.6_GH0.tar.gz) = e5f223d6309b7eecd8c3269f4c375ffedf0db8e5a9230b4b287d2de63c461616 -SIZE (hashicorp-nomad-v0.5.6_GH0.tar.gz) = 17675007 +TIMESTAMP = 1503965415 +SHA256 (hashicorp-nomad-v0.6.1_GH0.tar.gz) = 0c81b4f74c034db96f12386115ac5e549113a80a80fb34b7edc31b139ef6bf17 +SIZE (hashicorp-nomad-v0.6.1_GH0.tar.gz) = 17232937 SHA256 (armon-go-radix-4239b77_GH0.tar.gz) = 7aca5d599d3014f98c01f9c59f638f031d7c3779a491f861d0fe9d7ac8840e61 SIZE (armon-go-radix-4239b77_GH0.tar.gz) = 5481 SHA256 (axw-gocov-c77561c_GH0.tar.gz) = 47451bdf1a1704f3c08dc66b24572ead4f76b5bd21f802ed0ec7a3e049ebf3f9 diff --git a/sysutils/passwordsafe/Makefile b/sysutils/passwordsafe/Makefile index 852c6ab269f5..663e39268e01 100644 --- a/sysutils/passwordsafe/Makefile +++ b/sysutils/passwordsafe/Makefile @@ -2,6 +2,7 @@ PORTNAME= passwordsafe DISTVERSION= 1.02BETA +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= brnrd@FreeBSD.org @@ -10,7 +11,7 @@ COMMENT= Popular secure and convenient password manager LICENSE= ART20 LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ - libxerces-c-3.1.so:textproc/xerces-c3 + libxerces-c.so:textproc/xerces-c3 BUILD_DEPENDS= zip:archivers/zip NOT_FOR_ARCHS= aarch64 armv6 diff --git a/sysutils/py-google-compute-engine/Makefile b/sysutils/py-google-compute-engine/Makefile index 796a03adbf89..9c39f49d3985 100644 --- a/sysutils/py-google-compute-engine/Makefile +++ b/sysutils/py-google-compute-engine/Makefile @@ -2,6 +2,7 @@ PORTNAME= google-compute-engine PORTVERSION= 2.4.1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -24,6 +25,7 @@ USE_RC_SUBR= google_instance_setup \ google_network_setup \ google_accounts_daemon \ google_clock_skew_daemon \ + google_ip_forwarding_daemon \ google_startup NO_ARCH= yes diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile index 503f1c2fcf7b..0d417e6a5f42 100644 --- a/sysutils/py-psutil/Makefile +++ b/sysutils/py-psutil/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= psutil -PORTVERSION= 5.2.2 +PORTVERSION= 5.3.0 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-psutil/distinfo b/sysutils/py-psutil/distinfo index bc0018e901cd..da6a82a4f43b 100644 --- a/sysutils/py-psutil/distinfo +++ b/sysutils/py-psutil/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491897974 -SHA256 (psutil-5.2.2.tar.gz) = 44746540c0fab5b95401520d29eb9ffe84b3b4a235bd1d1971cbe36e1f38dd13 -SIZE (psutil-5.2.2.tar.gz) = 348413 +TIMESTAMP = 1504355550 +SHA256 (psutil-5.3.0.tar.gz) = a3940e06e92c84ab6e82b95dad056241beea93c3c9b1d07ddf96485079855185 +SIZE (psutil-5.3.0.tar.gz) = 397265 diff --git a/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c b/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c deleted file mode 100644 index 36cda53e3b93..000000000000 --- a/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c +++ /dev/null @@ -1,171 +0,0 @@ ---- psutil/arch/bsd/freebsd_socks.c.orig 2017-03-26 08:09:27 UTC -+++ psutil/arch/bsd/freebsd_socks.c -@@ -112,10 +112,17 @@ psutil_sockaddr_matches(int family, int - } - - -+#if __FreeBSD_version >= 1200026 -+static struct xtcpcb * -+psutil_search_tcplist(char *buf, struct kinfo_file *kif) { -+ struct xtcpcb *tp; -+ struct xinpcb *inp; -+#else - static struct tcpcb * - psutil_search_tcplist(char *buf, struct kinfo_file *kif) { - struct tcpcb *tp; - struct inpcb *inp; -+#endif - struct xinpgen *xig, *oxig; - struct xsocket *so; - -@@ -123,9 +130,15 @@ psutil_search_tcplist(char *buf, struct - for (xig = (struct xinpgen *)((char *)xig + xig->xig_len); - xig->xig_len > sizeof(struct xinpgen); - xig = (struct xinpgen *)((char *)xig + xig->xig_len)) { -+#if __FreeBSD_version >= 1200026 -+ tp = (struct xtcpcb *)xig; -+ inp = &tp->xt_inp; -+ so = &inp->xi_socket; -+#else - tp = &((struct xtcpcb *)xig)->xt_tp; - inp = &((struct xtcpcb *)xig)->xt_inp; - so = &((struct xtcpcb *)xig)->xt_socket; -+#endif - - if (so->so_type != kif->kf_sock_type || - so->xso_family != kif->kf_sock_domain || -@@ -135,20 +148,36 @@ psutil_search_tcplist(char *buf, struct - if (kif->kf_sock_domain == AF_INET) { - if (!psutil_sockaddr_matches( - AF_INET, inp->inp_lport, &inp->inp_laddr, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_local)) -+#else -+ &kif->kf_un.kf_sock.kf_sa_local)) -+#endif - continue; - if (!psutil_sockaddr_matches( - AF_INET, inp->inp_fport, &inp->inp_faddr, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_peer)) -+#else -+ &kif->kf_un.kf_sock.kf_sa_peer)) -+#endif - continue; - } else { - if (!psutil_sockaddr_matches( - AF_INET6, inp->inp_lport, &inp->in6p_laddr, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_local)) -+#else -+ &kif->kf_un.kf_sock.kf_sa_local)) -+#endif - continue; - if (!psutil_sockaddr_matches( - AF_INET6, inp->inp_fport, &inp->in6p_faddr, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_peer)) -+#else -+ &kif->kf_un.kf_sock.kf_sa_peer)) -+#endif - continue; - } - -@@ -208,7 +237,11 @@ int psutil_gather_inet(int proto, PyObje - struct xinpgen *xig, *exig; - struct xinpcb *xip; - struct xtcpcb *xtp; -+#if __FreeBSD_version >= 1200026 -+ struct xinpcb *inp; -+#else - struct inpcb *inp; -+#endif - struct xsocket *so; - const char *varname = NULL; - size_t len, bufsize; -@@ -273,8 +306,13 @@ int psutil_gather_inet(int proto, PyObje - goto error; - } - inp = &xtp->xt_inp; -+#if __FreeBSD_version >= 1200026 -+ so = &inp->xi_socket; -+ status = xtp->t_state; -+#else - so = &xtp->xt_socket; - status = xtp->xt_tp.t_state; -+#endif - break; - case IPPROTO_UDP: - xip = (struct xinpcb *)xig; -@@ -283,7 +321,11 @@ int psutil_gather_inet(int proto, PyObje - "struct xinpcb size mismatch"); - goto error; - } -+#if __FreeBSD_version >= 1200026 -+ inp = xip; -+#else - inp = &xip->xi_inp; -+#endif - so = &xip->xi_socket; - status = PSUTIL_CONN_NONE; - break; -@@ -477,7 +519,11 @@ psutil_proc_connections(PyObject *self, - struct kinfo_file *freep = NULL; - struct kinfo_file *kif; - char *tcplist = NULL; -+#if __FreeBSD_version >= 1200026 -+ struct xtcpcb *tcp; -+#else - struct tcpcb *tcp; -+#endif - - PyObject *py_retlist = PyList_New(0); - PyObject *py_tuple = NULL; -@@ -547,19 +593,35 @@ psutil_proc_connections(PyObject *self, - inet_ntop( - kif->kf_sock_domain, - psutil_sockaddr_addr(kif->kf_sock_domain, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_local), -+#else -+ &kif->kf_un.kf_sock.kf_sa_local), -+#endif - lip, - sizeof(lip)); - inet_ntop( - kif->kf_sock_domain, - psutil_sockaddr_addr(kif->kf_sock_domain, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_peer), -+#else -+ &kif->kf_un.kf_sock.kf_sa_peer), -+#endif - rip, - sizeof(rip)); - lport = htons(psutil_sockaddr_port(kif->kf_sock_domain, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_local)); -+#else -+ &kif->kf_un.kf_sock.kf_sa_local)); -+#endif - rport = htons(psutil_sockaddr_port(kif->kf_sock_domain, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_peer)); -+#else -+ &kif->kf_un.kf_sock.kf_sa_peer)); -+#endif - - // construct python tuple/list - py_laddr = Py_BuildValue("(si)", lip, lport); -@@ -590,7 +652,11 @@ psutil_proc_connections(PyObject *self, - else if (kif->kf_sock_domain == AF_UNIX) { - struct sockaddr_un *sun; - -+#if __FreeBSD_version < 1200031 - sun = (struct sockaddr_un *)&kif->kf_sa_local; -+#else -+ sun = (struct sockaddr_un *)&kif->kf_un.kf_sock.kf_sa_local; -+#endif - snprintf( - path, sizeof(path), "%.*s", - (int)(sun->sun_len - (sizeof(*sun) - sizeof(sun->sun_path))), diff --git a/sysutils/py-psutil/files/patch-psutil-arch-freebsd-proc_socks.c b/sysutils/py-psutil/files/patch-psutil-arch-freebsd-proc_socks.c new file mode 100644 index 000000000000..b96ef2f07dd8 --- /dev/null +++ b/sysutils/py-psutil/files/patch-psutil-arch-freebsd-proc_socks.c @@ -0,0 +1,62 @@ +--- psutil/arch/freebsd/proc_socks.c.orig 2017-08-03 16:14:27 UTC ++++ psutil/arch/freebsd/proc_socks.c +@@ -136,7 +136,11 @@ psutil_search_tcplist(char *buf, struct + if (kif->kf_sock_domain == AF_INET) { + if (!psutil_sockaddr_matches( + AF_INET, inp->inp_lport, &inp->inp_laddr, ++#if __FreeBSD_version >= 1200031 ++ &kif->kf_un.kf_sock.kf_sa_local)) ++#else + &kif->kf_sa_local)) ++#endif + continue; + if (!psutil_sockaddr_matches( + AF_INET, inp->inp_fport, &inp->inp_faddr, +@@ -145,7 +149,11 @@ psutil_search_tcplist(char *buf, struct + } else { + if (!psutil_sockaddr_matches( + AF_INET6, inp->inp_lport, &inp->in6p_laddr, ++#if __FreeBSD_version >= 1200031 ++ &kif->kf_un.kf_sock.kf_sa_local)) ++#else + &kif->kf_sa_local)) ++#endif + continue; + if (!psutil_sockaddr_matches( + AF_INET6, inp->inp_fport, &inp->in6p_faddr, +@@ -243,7 +251,11 @@ psutil_proc_connections(PyObject *self, + inet_ntop( + kif->kf_sock_domain, + psutil_sockaddr_addr(kif->kf_sock_domain, ++#if __FreeBSD_version >= 1200031 ++ &kif->kf_un.kf_sock.kf_sa_local), ++#else + &kif->kf_sa_local), ++#endif + lip, + sizeof(lip)); + inet_ntop( +@@ -253,7 +265,11 @@ psutil_proc_connections(PyObject *self, + rip, + sizeof(rip)); + lport = htons(psutil_sockaddr_port(kif->kf_sock_domain, ++#if __FreeBSD_version >= 1200031 ++ &kif->kf_un.kf_sock.kf_sa_local)); ++#else + &kif->kf_sa_local)); ++#endif + rport = htons(psutil_sockaddr_port(kif->kf_sock_domain, + &kif->kf_sa_peer)); + +@@ -287,7 +303,11 @@ psutil_proc_connections(PyObject *self, + else if (kif->kf_sock_domain == AF_UNIX) { + struct sockaddr_un *sun; + ++#if __FreeBSD_version >= 1200031 ++ sun = (struct sockaddr_un *)&kif->kf_un.kf_sock.kf_sa_local; ++#else + sun = (struct sockaddr_un *)&kif->kf_sa_local; ++#endif + snprintf( + path, sizeof(path), "%.*s", + (int)(sun->sun_len - (sizeof(*sun) - sizeof(sun->sun_path))), diff --git a/sysutils/rubygem-sys-filesystem/Makefile b/sysutils/rubygem-sys-filesystem/Makefile index d96dba910197..7e5a32f5b27d 100644 --- a/sysutils/rubygem-sys-filesystem/Makefile +++ b/sysutils/rubygem-sys-filesystem/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sys-filesystem -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 CATEGORIES= sysutils rubygems MASTER_SITES= RG diff --git a/sysutils/rubygem-sys-filesystem/distinfo b/sysutils/rubygem-sys-filesystem/distinfo index 572c09e1dccc..4f95a7b188cb 100644 --- a/sysutils/rubygem-sys-filesystem/distinfo +++ b/sysutils/rubygem-sys-filesystem/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475148797 -SHA256 (rubygem/sys-filesystem-1.1.7.gem) = 2e9bd13ed4619f58e6726b25bd90e3cca188826a371ab97cbdca5951fc6cb181 -SIZE (rubygem/sys-filesystem-1.1.7.gem) = 24576 +TIMESTAMP = 1504443422 +SHA256 (rubygem/sys-filesystem-1.1.8.gem) = c00a1bd3ddf6835a01abeabc61b3ba7dce1396fb762ff641b438f09adc3d81e9 +SIZE (rubygem/sys-filesystem-1.1.8.gem) = 24576 diff --git a/sysutils/storcli/Makefile b/sysutils/storcli/Makefile index bf14514e1867..cb0b8b00c53b 100644 --- a/sysutils/storcli/Makefile +++ b/sysutils/storcli/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= storcli -PORTVERSION= 1.20.15 +PORTVERSION= 1.23.02 CATEGORIES= sysutils MASTER_SITES= https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/ DISTNAME= ${PORTVERSION}_StorCLI @@ -25,9 +25,10 @@ NO_WRKSUBDIR= yes PLIST_FILES= sbin/storcli PKGMESSAGE= ${WRKDIR}/pkg-message -BINSRC= ${WRKSRC}/storcli_All_OS/storcli_All_OS/FreeBSD +BINSRC= ${WRKSRC}/storcli_All_OS/FreeBSD post-extract: + @${TAR} xf ${WRKSRC}/storcli_All_OS.zip -C${WRKSRC} @${TAR} xf ${BINSRC}/storcli${ARCH:S/i386//:S/amd64/64/}.tar -C${WRKSRC} @${REINPLACE_CMD} 's#\(StorCli\).*StorCli64#\1#'\ ${BINSRC}/FreeBSD_readme.txt diff --git a/sysutils/storcli/distinfo b/sysutils/storcli/distinfo index 682cccdb44fa..796b9a0cc93a 100644 --- a/sysutils/storcli/distinfo +++ b/sysutils/storcli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1480908202 -SHA256 (1.20.15_StorCLI.zip) = 04272ebe0978f22d065193988561a128215f7797854b23ad0cdf741f2b234ae6 -SIZE (1.20.15_StorCLI.zip) = 47065136 +TIMESTAMP = 1504079269 +SHA256 (1.23.02_StorCLI.zip) = d7cd07b7af93cbeb5735f5d4754fb5cb0fa92af3965017c6642e5273e10eb8ff +SIZE (1.23.02_StorCLI.zip) = 48778476 diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index 27eeed6f47d1..367d01995d19 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -VERSIONS= 36 37 39 310 -SYSLOG_NG_VERSION?= 37 +VERSIONS= 36 37 39 310 311 +SYSLOG_NG_VERSION?= 311 MASTERDIR= ${.CURDIR}/../syslog-ng${SYSLOG_NG_VERSION} diff --git a/sysutils/syslog-ng311/Makefile b/sysutils/syslog-ng311/Makefile new file mode 100644 index 000000000000..a2ede2d5f648 --- /dev/null +++ b/sysutils/syslog-ng311/Makefile @@ -0,0 +1,171 @@ +# Created by: Ivan Lago <ivan.lago@ifom-ieo-campus.it> +# $FreeBSD$ + +PORTNAME= syslog-ng +DISTVERSION= 3.11.1 +CATEGORIES= sysutils +DISTFILES= syslog-ng-${DISTVERSION}.tar.gz +MASTER_SITES= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/ +PKGNAMESUFFIX= 311 + +MAINTAINER= cy@FreeBSD.org +COMMENT= Powerful syslogd replacement + +LIB_DEPENDS= libpcre.so:devel/pcre \ + libuuid.so:misc/e2fsprogs-libuuid \ + libbson-1.0.so:devel/libbson \ + libevtlog.so:sysutils/eventlog + +BROKEN_powerpc64= fails to link: Internal error: Segmentation fault (program ld) +BROKEN_sparc64= fails to link: Internal error: Segmentation fault (program ld) + +CONFLICTS?= syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \ + syslog-ng[0-9][0-9]-[0-9]* \ + syslog-ng-devel-[0-9]* eventlog* +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} + +MAKE_JOBS_UNSAFE= yes +OPTIONS_DEFINE= TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP GEOIP2 DOCS REDIS JAVA PYTHON MONGO CURL JAVA_MOD +OPTIONS_DEFAULT= JSON +TCP_WRAPPERS_DESC= Build with TCP Wrappers +SQL_DESC= Build with database (libdbi) support +SPOOF_DESC= Build with spoof source support +SMTP_DESC= Build with SMTP support +JSON_DESC= Build with JSON-C support +GEOIP_DESC= Build with GeoIP support (depreciated) +GEOIP2_DESC= Build with geoip2 (MaxMindDB) support +REDIS_DESC= Build with Redis support +JAVA_DESC= Build with Java support (no modules) +JAVA_MOD_DESC= Build with Java modules (needs Maven / Internet access) +PYTHON_DESC= Build with Python 2.7 support +CURL_DESC= Build with Curl HTTP support + +USES= autoreconf:build gmake libtool pathfix pkgconfig ssl \ + gettext-runtime python shebangfix +USE_LDCONFIG= yes +USE_RC_SUBR= syslog-ng +SHEBANG_FILES= lib/merge-grammar.py +SHEBANG_LANG= python +GNU_CONFIGURE= yes +USE_GNOME= glib20 +SUB_FILES= pkg-message +INSTALL_TARGET= install-strip + +CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ + --enable-dynamic-linking --enable-manpages \ + --disable-linux-caps \ + --datadir=${PREFIX}/share/ + +CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" + +TCP_WRAPPERS_CONFIGURE_ENABLE= tcp-wrapper + +SPOOF_LIB_DEPENDS= libnet.so:net/libnet +SPOOF_CONFIGURE_ENABLE= spoof-source +SPOOF_CONFIGURE_ON= --with-libnet=/usr/local/bin +SPOOF_CONFIGURE_ENV= LIBNET_CFLAGS="-I/usr/local/include" \ + LIBNET_LIBS="-L/usr/local/lib -lnet" + + +IPV6_CONFIGURE_ENABLE= ipv6 + +GEOIP_CONFIGURE_ENABLE= geoip +GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP +GEOIP_CONFIGURE_ENV= GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP" +GEOIP_PLIST_FILES= lib/syslog-ng/libgeoip-plugin.so + +GEOIP2_CONFIGURE_ENABLE= geoip2 +GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb +GEOIP2_LDFLAGS= -L${LOCALBASE}/lib +GEOIP2_PLIST_FILES= lib/syslog-ng/libgeoip2-plugin.so + +REDIS_CONFIGURE_ENABLE= redis +REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis +REDIS_PLIST_FILES= lib/syslog-ng/libredis.so + +SMTP_CONFIGURE_ON= --with-libesmtp=${LOCALBASE} --enable-smtp +SMTP_CONFIGURE_OFF= --without-libesmtp --disable-smtp +SMTP_LIB_DEPENDS= libesmtp.so:mail/libesmtp +SMTP_PLIST_FILES= lib/syslog-ng/libafsmtp.so + +SQL_CONFIGURE_ENABLE= sql +SQL_LIB_DEPENDS= libdbi.so:databases/libdbi +SQL_CONFIGURE_ENV= LIBDBI_LIBS="-ldbi" +SQL_LDFLAGS= -L${LOCALBASE}/lib +SQL_PLIST_FILES= lib/syslog-ng/libafsql.so + +MONGO_CONFIGURE_ENABLE= mongodb +MONGO_LIB_DEPENDS= libmongoc-1.0.so:devel/mongo-c-driver +MONGO_PLIST_FILES= lib/syslog-ng/libafmongodb.so + +JSON_CONFIGURE_ENABLE= json +JSON_LIB_DEPENDS= libjson-c.so:devel/json-c +JSON_PLIST_FILES= lib/syslog-ng/libjson-plugin.so \ + share/syslog-ng/include/scl/cim/template.conf + +JAVA_CONFIGURE_ENABLE= java +JAVA_USE_JAVA= yes +JAVA_PLIST_FILES= lib/syslog-ng/libmod-java.so \ + lib/syslog-ng/java-modules/syslog-ng-core.jar + +JAVA_MOD_CONFIGURE_ENABLE= java-modules +JAVA_MOD_USE_JAVA= yes +JAVA_MOD_BUILD_DEPENDS= gradle:devel/gradle \ + bash:shells/bash +JAVA_MOD_PLIST_DIRS= lib/syslog-ng/java-modules/elastic-jest-client +JAVA_MOD_PLIST_FILES= lib/syslog-ng/java-modules/log4j-1.2.16.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/jest-2.0.2.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/jest-common-2.0.2.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/httpcore-nio-4.4.4.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/httpclient-4.5.2.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/httpasyncclient-4.1.1.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/slf4j-api-1.7.13.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/guava-19.0.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/gson-2.6.2.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/commons-lang3-3.4.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/httpcore-4.4.4.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/commons-logging-1.2.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/commons-codec-1.9.jar \ + lib/syslog-ng/java-modules/elastic-jest-client/slf4j-simple-1.7.13.jar \ + lib/syslog-ng/java-modules/hdfs.jar \ + lib/syslog-ng/java-modules/elastic.jar \ + lib/syslog-ng/java-modules/elastic-v2.jar \ + lib/syslog-ng/java-modules/kafka.jar \ + lib/syslog-ng/java-modules/dummy.jar \ + lib/syslog-ng/java-modules/http.jar \ + lib/syslog-ng/java-modules/syslog-ng-common.jar + +PYTHON_CONFIGURE_ENABLE= python +PYTHON_CONFIGURE_WITH= python=2.7 +PYTHON_USES= python:2.7 +PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so + +CURL_CONFIGURE_OFF= --with-libcurl=off +CURL_LIB_DEPENDS= libcurl.so:ftp/curl +CURL_PLIST_FILES= lib/syslog-ng/libhttp.so + +.include <bsd.port.pre.mk> + +post-patch: + @${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist + @${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample + +post-install: +.if ${PORT_OPTIONS:MDOCS} + ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/NEWS.md ${STAGEDIR}${DOCSDIR} +.endif + ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${PREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${STAGEDIR}${PREFIX}/man/man5/ + ${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${PREFIX}/man/man8/ + ${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \ + ${STAGEDIR}${PREFIX}/etc + ${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist \ + ${WRKSRC}/scl/scl.conf.sample ${STAGEDIR}${PREFIX}/etc + ${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \ + ${STAGEDIR}${PREFIX}/include/syslog-ng/ + +.include <bsd.port.post.mk> diff --git a/sysutils/syslog-ng311/distinfo b/sysutils/syslog-ng311/distinfo new file mode 100644 index 000000000000..19b4ebc824d6 --- /dev/null +++ b/sysutils/syslog-ng311/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1504528897 +SHA256 (syslog-ng-3.11.1.tar.gz) = 64099dc39d2d760f8fd24db44054df7874862949dbcf773fc18fe83ce00a45e9 +SIZE (syslog-ng-3.11.1.tar.gz) = 8523684 diff --git a/sysutils/syslog-ng311/files/patch-configure b/sysutils/syslog-ng311/files/patch-configure new file mode 100644 index 000000000000..1d9486b6e05e --- /dev/null +++ b/sysutils/syslog-ng311/files/patch-configure @@ -0,0 +1,58 @@ +--- configure.orig 2016-08-10 07:38:05.000000000 -0700 ++++ configure 2016-08-10 12:33:00.605666000 -0700 +@@ -10250,7 +10250,7 @@ + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no +- link_all_deplibs=unknown ++ link_all_deplibs=no + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= +@@ -11952,6 +11952,7 @@ + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}${major}' + need_version=no + need_lib_prefix=no + ;; +@@ -13035,7 +13036,7 @@ + old_striplib= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } +-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -15195,9 +15196,9 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNET" >&5 + $as_echo_n "checking for LIBNET... " >&6; } + if test "x$with_libnet" = "x"; then +- LIBNET_CONFIG="`which libnet-config`" ++ LIBNET_CONFIG="`which libnet11-config`" + else +- LIBNET_CONFIG="$with_libnet/libnet-config" ++ LIBNET_CONFIG="$with_libnet/libnet11-config" + fi + + if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then +@@ -16424,7 +16425,7 @@ + if test -e "$JAVA_HOME_CHECKER"; then + JNI_HOME=`$JAVA_HOME_CHECKER` + else +- JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\//"` ++ JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"` + fi + + JNI_LIBDIR=`find $JNI_HOME \( -name "libjvm.so" -or -name "libjvm.dylib" \) \ +@@ -16531,7 +16532,7 @@ + if test -e "$JAVA_HOME_CHECKER"; then + JNI_HOME=`$JAVA_HOME_CHECKER` + else +- JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\//"` ++ JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"` + fi + + JNI_LIBDIR=`find $JNI_HOME \( -name "libjvm.so" -or -name "libjvm.dylib" \) \ diff --git a/sysutils/syslog-ng311/files/pkg-message.in b/sysutils/syslog-ng311/files/pkg-message.in new file mode 100644 index 000000000000..36cb7e65a243 --- /dev/null +++ b/sysutils/syslog-ng311/files/pkg-message.in @@ -0,0 +1,29 @@ + +syslog-ng is now installed! To replace FreeBSD's standard syslogd +(/usr/sbin/syslogd), complete these steps: + +1. Create a configuration file named %%PREFIX%%/etc/syslog-ng.conf + (a sample named syslog-ng.conf.sample has been included in + %%PREFIX%%/etc). Note that this is a change in 2.0.2 + version, previous ones put the config file in + %%PREFIX%%/etc/syslog-ng/syslog-ng.conf, so if this is an update + move that file in the right place + +2. Configure syslog-ng to start automatically by adding the following + to /etc/rc.conf: + + syslog_ng_enable="YES" + +3. Prevent the standard FreeBSD syslogd from starting automatically by + adding a line to the end of your /etc/rc.conf file that reads: + + syslogd_enable="NO" + +4. Shut down the standard FreeBSD syslogd: + + kill `cat /var/run/syslog.pid` + +5. Start syslog-ng: + + %%PREFIX%%/etc/rc.d/syslog-ng start + diff --git a/sysutils/syslog-ng311/files/syslog-ng.conf.sample b/sysutils/syslog-ng311/files/syslog-ng.conf.sample new file mode 100644 index 000000000000..7b9e96b36245 --- /dev/null +++ b/sysutils/syslog-ng311/files/syslog-ng.conf.sample @@ -0,0 +1,185 @@ +@version:3.11 +@include "scl.conf" + +# +# This sample configuration file is essentially equilivent to the stock +# FreeBSD /etc/syslog.conf file. +# +# $FreeBSD: head/sysutils/syslog-ng/files/syslog-ng.conf.sample 340872 2014-01-24 00:14:07Z mat $ +# + +# +# options +# +options { chain_hostnames(off); flush_lines(0); threaded(yes); }; + +# +# sources +# +source src { system(); + udp(); internal(); }; + +# +# destinations +# +destination messages { file("/var/log/messages"); }; +destination security { file("/var/log/security"); }; +destination authlog { file("/var/log/auth.log"); }; +destination maillog { file("/var/log/maillog"); }; +destination lpd-errs { file("/var/log/lpd-errs"); }; +destination xferlog { file("/var/log/xferlog"); }; +destination cron { file("/var/log/cron"); }; +destination debuglog { file("/var/log/debug.log"); }; +destination consolelog { file("/var/log/console.log"); }; +destination all { file("/var/log/all.log"); }; +destination newscrit { file("/var/log/news/news.crit"); }; +destination newserr { file("/var/log/news/news.err"); }; +destination newsnotice { file("/var/log/news/news.notice"); }; +destination slip { file("/var/log/slip.log"); }; +destination ppp { file("/var/log/ppp.log"); }; +destination console { file("/dev/console"); }; +destination allusers { usertty("*"); }; +#destination loghost { udp("loghost" port(514)); }; + +# +# log facility filters +# +filter f_auth { facility(auth); }; +filter f_authpriv { facility(authpriv); }; +filter f_not_authpriv { not facility(authpriv); }; +#filter f_console { facility(console); }; +filter f_cron { facility(cron); }; +filter f_daemon { facility(daemon); }; +filter f_ftp { facility(ftp); }; +filter f_kern { facility(kern); }; +filter f_lpr { facility(lpr); }; +filter f_mail { facility(mail); }; +filter f_news { facility(news); }; +filter f_security { facility(security); }; +filter f_user { facility(user); }; +filter f_uucp { facility(uucp); }; +filter f_local0 { facility(local0); }; +filter f_local1 { facility(local1); }; +filter f_local2 { facility(local2); }; +filter f_local3 { facility(local3); }; +filter f_local4 { facility(local4); }; +filter f_local5 { facility(local5); }; +filter f_local6 { facility(local6); }; +filter f_local7 { facility(local7); }; + +# +# log level filters +# +filter f_emerg { level(emerg); }; +filter f_alert { level(alert..emerg); }; +filter f_crit { level(crit..emerg); }; +filter f_err { level(err..emerg); }; +filter f_warning { level(warning..emerg); }; +filter f_notice { level(notice..emerg); }; +filter f_info { level(info..emerg); }; +filter f_debug { level(debug..emerg); }; +filter f_is_debug { level(debug); }; + +# +# program filters +# +filter f_ppp { program("ppp"); }; +filter f_slip { program("startslip"); }; + +# +# *.err;kern.warning;auth.notice;mail.crit /dev/console +# +log { source(src); filter(f_err); destination(console); }; +log { source(src); filter(f_kern); filter(f_warning); destination(console); }; +log { source(src); filter(f_auth); filter(f_notice); destination(console); }; +log { source(src); filter(f_mail); filter(f_crit); destination(console); }; + +# +# *.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err /var/log/messages +# +log { source(src); filter(f_notice); filter(f_not_authpriv); destination(messages); }; +log { source(src); filter(f_kern); filter(f_debug); destination(messages); }; +log { source(src); filter(f_lpr); filter(f_info); destination(messages); }; +log { source(src); filter(f_mail); filter(f_crit); destination(messages); }; +log { source(src); filter(f_news); filter(f_err); destination(messages); }; + +# +# security.* /var/log/security +# +log { source(src); filter(f_security); destination(security); }; + +# +# auth.info;authpriv.info /var/log/auth.log +log { source(src); filter(f_auth); filter(f_info); destination(authlog); }; +log { source(src); filter(f_authpriv); filter(f_info); destination(authlog); }; + +# +# mail.info /var/log/maillog +# +log { source(src); filter(f_mail); filter(f_info); destination(maillog); }; + +# +# lpr.info /var/log/lpd-errs +# +log { source(src); filter(f_lpr); filter(f_info); destination(lpd-errs); }; + +# +# ftp.info /var/log/xferlog +# +log { source(src); filter(f_ftp); filter(f_info); destination(xferlog); }; + +# +# cron.* /var/log/cron +# +log { source(src); filter(f_cron); destination(cron); }; + +# +# *.=debug /var/log/debug.log +# +log { source(src); filter(f_is_debug); destination(debuglog); }; + +# +# *.emerg * +# +log { source(src); filter(f_emerg); destination(allusers); }; + +# +# uncomment this to log all writes to /dev/console to /var/log/console.log +# console.info /var/log/console.log +# +#log { source(src); filter(f_console); filter(f_info); destination(consolelog); }; + +# +# uncomment this to enable logging of all log messages to /var/log/all.log +# touch /var/log/all.log and chmod it to mode 600 before it will work +# *.* /var/log/all.log +# +#log { source(src); destination(all); }; + +# +# uncomment this to enable logging to a remote loghost named loghost +# *.* @loghost +# +#log { source(src); destination(loghost); }; + +# +# uncomment these if you're running inn +# news.crit /var/log/news/news.crit +# news.err /var/log/news/news.err +# news.notice /var/log/news/news.notice +# +#log { source(src); filter(f_news); filter(f_crit); destination(newscrit); }; +#log { source(src); filter(f_news); filter(f_err); destination(newserr); }; +#log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); }; + +# +# !startslip +# *.* /var/log/slip.log +# +log { source(src); filter(f_slip); destination(slip); }; + +# +# !ppp +# *.* /var/log/ppp.log +# +log { source(src); filter(f_ppp); destination(ppp); }; diff --git a/sysutils/syslog-ng311/files/syslog-ng.in b/sysutils/syslog-ng311/files/syslog-ng.in new file mode 100644 index 000000000000..ae24e4984375 --- /dev/null +++ b/sysutils/syslog-ng311/files/syslog-ng.in @@ -0,0 +1,46 @@ +#!/bin/sh +# +# $FreeBSD: head/sysutils/syslog-ng/files/syslog-ng.in 340872 2014-01-24 00:14:07Z mat $ +# + +# PROVIDE: syslogd +# REQUIRE: mountcritremote cleanvar ldconfig +# BEFORE: SERVERS + +# +# Add the following line to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +#syslog_ng_enable="YES" +#syslog_ng_config="-u daemon" +#syslog_ng_pid="/var/run/syslog-ng.pid" +# + +syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"} + +. /etc/rc.subr + +name=syslog_ng +rcvar=syslog_ng_enable + +command=%%PREFIX%%/sbin/syslog-ng +required_files=%%PREFIX%%/etc/syslog-ng.conf +extra_commands=reload + +if checkyesno syslog_ng_purgeklog; then + start_precmd="echo \"Purging klog(9)\" && sysctl -w kern.msgbuf_clear=1 $start_precmd"; +fi + +stop_postcmd=stop_postcmd + +load_rc_config $name + +: ${syslog_ng_enable:="NO"} +pidfile=${syslog_ng_pid:-"/var/run/syslog.pid"} +command_args="-p ${pidfile} ${syslog_ng_config}" + +stop_postcmd() { + rm -f $pidfile +} + +run_rc_command "$1" diff --git a/sysutils/syslog-ng311/pkg-descr b/sysutils/syslog-ng311/pkg-descr new file mode 100644 index 000000000000..65aff196f0ad --- /dev/null +++ b/sysutils/syslog-ng311/pkg-descr @@ -0,0 +1,17 @@ +syslog-ng is an enhanced log daemon, supporting a wide range of input and +output methods: syslog, unstructured text, message queues, databases (SQL +and NoSQL alike) and more. + +Key features: + + * receive and send RFC3164 and RFC5424 style syslog messages + * work with any kind of unstructured data + * receive and send JSON formatted messages + * classify and structure logs with builtin parsers (csv-parser(), + db-parser(), ...) + * normalize, crunch and process logs as they flow through the system + * hand on messages for further processing using message queues (like + AMQP), files or databases (like PostgreSQL or MongoDB). + +The official home page of syslog-ng is: +WWW: http://www.balabit.com/network-security/syslog-ng/ diff --git a/sysutils/syslog-ng311/pkg-plist b/sysutils/syslog-ng311/pkg-plist new file mode 100644 index 000000000000..899e4b1e8b31 --- /dev/null +++ b/sysutils/syslog-ng311/pkg-plist @@ -0,0 +1,311 @@ +@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true +@sample etc/scl.conf.sample +etc/syslog-ng.conf.dist +@sample etc/syslog-ng.conf.sample +bin/pdbtool +bin/loggen +bin/update-patterndb +bin/dqtool +include/syslog-ng/evtlog.h +include/syslog-ng/evtmaps.h +include/syslog-ng/libtest/license_module_mock.h +include/syslog-ng/pe-versioning.h +include/syslog-ng/ivykis/iv_avl.h +include/syslog-ng/ivykis/iv_event.h +include/syslog-ng/ivykis/iv_event_raw.h +include/syslog-ng/ivykis/iv_list.h +include/syslog-ng/ivykis/iv_thread.h +include/syslog-ng/ivykis/iv_tls.h +include/syslog-ng/ivykis/iv_work.h +include/syslog-ng/ivykis/iv_fd_pump.h +include/syslog-ng/ivykis/iv_popen.h +include/syslog-ng/ivykis/iv_signal.h +include/syslog-ng/ivykis/iv_wait.h +include/syslog-ng/ivykis/iv.h +include/syslog-ng/compat/compat.h +include/syslog-ng/compat/getutent.h +include/syslog-ng/compat/glib.h +include/syslog-ng/compat/lfs.h +include/syslog-ng/compat/pio.h +include/syslog-ng/compat/socket.h +include/syslog-ng/compat/string.h +include/syslog-ng/compat/time.h +include/syslog-ng/control/control.h +include/syslog-ng/control/control-server.h +include/syslog-ng/scanner/csv-scanner/csv-scanner.h +include/syslog-ng/debugger/debugger.h +include/syslog-ng/debugger/tracer.h +include/syslog-ng/debugger/debugger-main.h +include/syslog-ng/filter/filter-expr.h +include/syslog-ng/filter/filter-op.h +include/syslog-ng/filter/filter-cmp.h +include/syslog-ng/filter/filter-in-list.h +include/syslog-ng/filter/filter-tags.h +include/syslog-ng/filter/filter-netmask.h +include/syslog-ng/filter/filter-netmask6.h +include/syslog-ng/filter/filter-call.h +include/syslog-ng/filter/filter-re.h +include/syslog-ng/filter/filter-pri.h +include/syslog-ng/filter/filter-pipe.h +include/syslog-ng/filter/filter-expr-parser.h +include/syslog-ng/libtest/testutils.h +include/syslog-ng/libtest/msg_parse_lib.h +include/syslog-ng/libtest/template_lib.h +include/syslog-ng/libtest/proto_lib.h +include/syslog-ng/libtest/persist_lib.h +include/syslog-ng/libtest/mock-transport.h +include/syslog-ng/logmsg/gsockaddr-serialize.h +include/syslog-ng/logmsg/logmsg.h +include/syslog-ng/logmsg/serialization.h +include/syslog-ng/logmsg/logmsg-serialize.h +include/syslog-ng/logmsg/logmsg-serialize-fixup.h +include/syslog-ng/logmsg/nvtable.h +include/syslog-ng/logmsg/nvtable-serialize.h +include/syslog-ng/logmsg/nvtable-serialize-endianutils.h +include/syslog-ng/logmsg/tags-serialize.h +include/syslog-ng/logmsg/timestamp-serialize.h +include/syslog-ng/logmsg/tags.h +include/syslog-ng/logproto/logproto-client.h +include/syslog-ng/logproto/logproto-server.h +include/syslog-ng/logproto/logproto-buffered-server.h +include/syslog-ng/logproto/logproto-dgram-server.h +include/syslog-ng/logproto/logproto-framed-client.h +include/syslog-ng/logproto/logproto-framed-server.h +include/syslog-ng/logproto/logproto-text-client.h +include/syslog-ng/logproto/logproto-text-server.h +include/syslog-ng/logproto/logproto-indented-multiline-server.h +include/syslog-ng/logproto/logproto-regexp-multiline-server.h +include/syslog-ng/logproto/logproto-record-server.h +include/syslog-ng/logproto/logproto-builtins.h +include/syslog-ng/logproto/logproto.h +include/syslog-ng/parser/parser-expr.h +include/syslog-ng/parser/parser-expr-parser.h +include/syslog-ng/syslog-ng-config.h +include/syslog-ng/afinter.h +include/syslog-ng/alarms.h +include/syslog-ng/apphook.h +include/syslog-ng/atomic.h +include/syslog-ng/block-ref-parser.h +include/syslog-ng/cache.h +include/syslog-ng/cfg.h +include/syslog-ng/cfg-grammar.h +include/syslog-ng/cfg-lexer.h +include/syslog-ng/cfg-lexer-subst.h +include/syslog-ng/cfg-args.h +include/syslog-ng/cfg-parser.h +include/syslog-ng/cfg-tree.h +include/syslog-ng/reloc.h +include/syslog-ng/children.h +include/syslog-ng/crypto.h +include/syslog-ng/dnscache.h +include/syslog-ng/driver.h +include/syslog-ng/fdhelpers.h +include/syslog-ng/file-perms.h +include/syslog-ng/find-crlf.h +include/syslog-ng/gprocess.h +include/syslog-ng/gsockaddr.h +include/syslog-ng/gsocket.h +include/syslog-ng/hostname.h +include/syslog-ng/host-resolve.h +include/syslog-ng/logmatcher.h +include/syslog-ng/logmpx.h +include/syslog-ng/logpipe.h +include/syslog-ng/logqueue-fifo.h +include/syslog-ng/logqueue.h +include/syslog-ng/logreader.h +include/syslog-ng/logsource.h +include/syslog-ng/logstamp.h +include/syslog-ng/logthrdestdrv.h +include/syslog-ng/logwriter.h +include/syslog-ng/mainloop.h +include/syslog-ng/mainloop-call.h +include/syslog-ng/mainloop-worker.h +include/syslog-ng/mainloop-io-worker.h +include/syslog-ng/module-config.h +include/syslog-ng/memtrace.h +include/syslog-ng/messages.h +include/syslog-ng/ml-batched-timer.h +include/syslog-ng/msg-format.h +include/syslog-ng/parse-number.h +include/syslog-ng/pathutils.h +include/syslog-ng/persist-state.h +include/syslog-ng/persistable-state-header.h +include/syslog-ng/persistable-state-presenter.h +include/syslog-ng/plugin.h +include/syslog-ng/plugin-types.h +include/syslog-ng/poll-events.h +include/syslog-ng/poll-fd-events.h +include/syslog-ng/pragma-parser.h +include/syslog-ng/presented-persistable-state.h +include/syslog-ng/rcptid.h +include/syslog-ng/run-id.h +include/syslog-ng/scratch-buffers.h +include/syslog-ng/serialize.h +include/syslog-ng/service-management.h +include/syslog-ng/seqnum.h +include/syslog-ng/str-format.h +include/syslog-ng/str-utils.h +include/syslog-ng/syslog-names.h +include/syslog-ng/syslog-ng.h +include/syslog-ng/string-list.h +include/syslog-ng/timeutils.h +include/syslog-ng/tls-support.h +include/syslog-ng/thread-utils.h +include/syslog-ng/tlscontext.h +include/syslog-ng/type-hinting.h +include/syslog-ng/uuid.h +include/syslog-ng/userdb.h +include/syslog-ng/utf8utils.h +include/syslog-ng/versioning.h +include/syslog-ng/bookmark.h +include/syslog-ng/ringbuffer.h +include/syslog-ng/ack_tracker.h +include/syslog-ng/rewrite/rewrite-expr.h +include/syslog-ng/rewrite/rewrite-set-tag.h +include/syslog-ng/rewrite/rewrite-set.h +include/syslog-ng/rewrite/rewrite-unset.h +include/syslog-ng/rewrite/rewrite-subst.h +include/syslog-ng/rewrite/rewrite-expr-parser.h +include/syslog-ng/rewrite/rewrite-groupset.h +include/syslog-ng/host-id.h +include/syslog-ng/resolved-configurable-paths.h +include/syslog-ng/stats/stats.h +include/syslog-ng/stats/stats-counter.h +include/syslog-ng/stats/stats-cluster.h +include/syslog-ng/stats/stats-csv.h +include/syslog-ng/stats/stats-log.h +include/syslog-ng/stats/stats-registry.h +include/syslog-ng/stats/stats-syslog.h +include/syslog-ng/template/templates.h +include/syslog-ng/template/macros.h +include/syslog-ng/template/function.h +include/syslog-ng/template/simple-function.h +include/syslog-ng/template/repr.h +include/syslog-ng/template/compiler.h +include/syslog-ng/template/user-function.h +include/syslog-ng/template/escaping.h +include/syslog-ng/template/common-template-typedefs.h +include/syslog-ng/transport/logtransport.h +include/syslog-ng/transport/transport-aux-data.h +include/syslog-ng/transport/transport-tls.h +include/syslog-ng/transport/transport-file.h +include/syslog-ng/transport/transport-pipe.h +include/syslog-ng/transport/transport-device.h +include/syslog-ng/transport/transport-socket.h +include/syslog-ng/value-pairs/value-pairs.h +include/syslog-ng/value-pairs/transforms.h +include/syslog-ng/value-pairs/cmdline.h +include/syslog-ng/value-pairs/evttag.h +include/syslog-ng/iv.h +include/syslog-ng/iv_avl.h +include/syslog-ng/iv_event.h +include/syslog-ng/iv_event_raw.h +include/syslog-ng/iv_fd_pump.h +include/syslog-ng/iv_inotify.h +include/syslog-ng/iv_list.h +include/syslog-ng/iv_popen.h +include/syslog-ng/iv_signal.h +include/syslog-ng/iv_thread.h +include/syslog-ng/iv_tls.h +include/syslog-ng/iv_wait.h +include/syslog-ng/iv_work.h +include/syslog-ng/compat/openssl_support.h +include/syslog-ng/modules/add-contextual-data/add-contextual-data-parser.h +include/syslog-ng/modules/add-contextual-data/add-contextual-data-selector.h +include/syslog-ng/modules/add-contextual-data/add-contextual-data-template-selector.h +include/syslog-ng/modules/add-contextual-data/add-contextual-data.h +include/syslog-ng/modules/add-contextual-data/context-info-db.h +include/syslog-ng/modules/add-contextual-data/contextual-data-record-scanner.h +include/syslog-ng/modules/add-contextual-data/csv-contextual-data-record-scanner.h +include/syslog-ng/str-repr/decode.h +include/syslog-ng/str-repr/encode.h +include/syslog-ng/compat/pcre.h +include/syslog-ng/control/control-commands.h +include/syslog-ng/control/control-main.h +include/syslog-ng/scanner/kv-scanner/kv-scanner.h +include/syslog-ng/scanner/list-scanner/list-scanner.h +include/syslog-ng/stats/stats-cluster-logpipe.h +include/syslog-ng/stats/stats-cluster-single.h +include/syslog-ng/stats/stats-control.h +include/syslog-ng/stats/stats-query-commands.h +include/syslog-ng/stats/stats-query.h +lib/libevtlog-3.11.so.0 +lib/libevtlog-3.11.so.0.0.0 +lib/libevtlog.so +lib/libsyslog-ng-3.11.so.0.0.0 +lib/libsyslog-ng-3.11.so.0 +lib/libsyslog-ng.so +lib/libsyslog-ng-native-connector.a +lib/syslog-ng/libtest/libsyslog-ng-test.a +lib/syslog-ng/libsyslogformat.so +lib/syslog-ng/libadd-contextual-data.so +lib/syslog-ng/libcef.so +lib/syslog-ng/libdate.so +lib/syslog-ng/libdisk-buffer.so +lib/syslog-ng/libafsocket.so +lib/syslog-ng/libaffile.so +lib/syslog-ng/libafprog.so +lib/syslog-ng/libafuser.so +lib/syslog-ng/libafamqp.so +lib/syslog-ng/libcsvparser.so +lib/syslog-ng/libconfgen.so +lib/syslog-ng/libsystem-source.so +lib/syslog-ng/liblinux-kmsg-format.so +lib/syslog-ng/libbasicfuncs.so +lib/syslog-ng/libcryptofuncs.so +lib/syslog-ng/libdbparser.so +lib/syslog-ng/libafstomp.so +lib/syslog-ng/libpseudofile.so +lib/syslog-ng/libgraphite.so +lib/syslog-ng/libkvformat.so +lib/syslog-ng/libmap-value-pairs.so +lib/syslog-ng/libsnmptrapd-parser.so +lib/syslog-ng/libstardate.so +lib/syslog-ng/libtfgetent.so +libdata/pkgconfig/syslog-ng.pc +libdata/pkgconfig/syslog-ng-test.pc +libdata/pkgconfig/syslog-ng-native-connector.pc +libdata/pkgconfig/syslog-ng-add-contextual-data.pc +man/man1/loggen.1.gz +man/man1/pdbtool.1.gz +man/man1/syslog-ng-ctl.1.gz +man/man5/syslog-ng.conf.5.gz +man/man8/syslog-ng.8.gz +man/man1/dqtool.1.gz +man/man1/syslog-ng-debun.1.gz +sbin/syslog-ng-debun +sbin/syslog-ng +sbin/syslog-ng-ctl +share/syslog-ng/include/scl/system/plugin.conf +share/syslog-ng/include/scl/pacct/plugin.conf +share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk +share/syslog-ng/include/scl/syslogconf/README +share/syslog-ng/include/scl/syslogconf/plugin.conf +share/syslog-ng/include/scl/rewrite/cc-mask.conf +share/syslog-ng/include/scl/nodejs/plugin.conf +share/syslog-ng/include/scl/graphite/README +share/syslog-ng/include/scl/graphite/plugin.conf +share/syslog-ng/include/scl/solaris/plugin.conf +share/syslog-ng/include/scl/mbox/mbox.conf +share/syslog-ng/include/scl/elasticsearch/plugin.conf +share/syslog-ng/include/scl/kafka/plugin.conf +share/syslog-ng/include/scl/hdfs/plugin.conf +share/syslog-ng/include/scl/apache/apache.conf +share/syslog-ng/include/scl/loggly/loggly.conf +share/syslog-ng/include/scl/logmatic/logmatic.conf +share/syslog-ng/include/scl/cisco/plugin.conf +share/syslog-ng/include/scl/snmptrap/snmptrapd-source.conf +share/syslog-ng/include/scl/osquery/plugin.conf +share/syslog-ng/tools/lex-rules.am +share/syslog-ng/tools/cfg-grammar.y +share/syslog-ng/tools/merge-grammar.py +share/syslog-ng/tools/system-expand.sh +share/syslog-ng/xsd/patterndb-1.xsd +share/syslog-ng/xsd/patterndb-2.xsd +share/syslog-ng/xsd/patterndb-3.xsd +share/syslog-ng/xsd/patterndb-4.xsd +share/syslog-ng/xsd/patterndb-5.xsd +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/NEWS.md +@dir etc/patterndb.d diff --git a/sysutils/ttyd/Makefile b/sysutils/ttyd/Makefile index 404f60407662..d02d6bdd279a 100644 --- a/sysutils/ttyd/Makefile +++ b/sysutils/ttyd/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ttyd -PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTVERSION= 1.3.3 CATEGORIES= sysutils MAINTAINER= neel@neelc.org diff --git a/sysutils/ttyd/distinfo b/sysutils/ttyd/distinfo index 26ece4d1cbee..b1b0b0fab01a 100644 --- a/sysutils/ttyd/distinfo +++ b/sysutils/ttyd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1494045863 -SHA256 (tsl0922-ttyd-1.3.2_GH0.tar.gz) = 6fcbdf4e4e630bb72597bcbebd529d57a4de2478040f465e412a6827b73ca46c -SIZE (tsl0922-ttyd-1.3.2_GH0.tar.gz) = 193270 +TIMESTAMP = 1504353640 +SHA256 (tsl0922-ttyd-1.3.3_GH0.tar.gz) = 6eed82895da1359538471cbcc82576c4a21a4c6854e1f125fc55215f7c51da52 +SIZE (tsl0922-ttyd-1.3.3_GH0.tar.gz) = 194715 diff --git a/sysutils/unetbootin/Makefile b/sysutils/unetbootin/Makefile new file mode 100644 index 000000000000..1408c7e20b70 --- /dev/null +++ b/sysutils/unetbootin/Makefile @@ -0,0 +1,47 @@ +# Created by: Alexey Dokuchaev <danfe@FreeBSD.org> +# $FreeBSD$ + +PORTNAME= unetbootin +PORTVERSION= 655 +PORTREVISION= 1 +CATEGORIES= sysutils +MASTER_SITES= SF/${PORTNAME}/UNetbootin/${PORTVERSION} +DISTNAME= ${PORTNAME}-source-${PORTVERSION} + +MAINTAINER= danfe@FreeBSD.org +COMMENT= Bootable Live USB creator for various Linux distributions + +LICENSE= GPLv2+ + +RUN_DEPENDS= 7z:archivers/p7zip \ + syslinux:sysutils/syslinux \ + mke2fs:sysutils/e2fsprogs + +USE_QT4= linguisttools_build moc_build qmake_build uic_build \ + corelib gui network +QMAKE_ARGS= DEFINES+=LOCALBASE=\\\\\\\"${LOCALBASE}\\\\\\\" + +NO_WRKSUBDIR= yes + +post-patch: + @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' \ + ${WRKSRC}/main.cpp + +do-configure: + ${LUPDATE} ${WRKSRC}/unetbootin.pro + ${LRELEASE} ${WRKSRC}/unetbootin.pro + cd ${WRKSRC} && ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/unetbootin ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/unetbootin.xpm \ + ${STAGEDIR}${PREFIX}/share/pixmaps + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/unetbootin_*.qm ${STAGEDIR}${DATADIR} +.for n in 16 22 24 32 48 64 128 192 256 512 + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps + ${INSTALL_DATA} ${WRKSRC}/unetbootin_${n}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps/unetbootin.png +.endfor + +.include <bsd.port.mk> diff --git a/sysutils/unetbootin/distinfo b/sysutils/unetbootin/distinfo new file mode 100644 index 000000000000..20b9e3d04184 --- /dev/null +++ b/sysutils/unetbootin/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1500449397 +SHA256 (unetbootin-source-655.tar.gz) = 700125b0ea45805a22f729986c59377b1ff0c0a66ea6f01b29cd3cf60bfbaa79 +SIZE (unetbootin-source-655.tar.gz) = 749246 diff --git a/sysutils/unetbootin/files/patch-main.cpp b/sysutils/unetbootin/files/patch-main.cpp new file mode 100644 index 000000000000..caecec52b6b5 --- /dev/null +++ b/sysutils/unetbootin/files/patch-main.cpp @@ -0,0 +1,32 @@ +--- main.cpp.orig 2017-04-21 04:57:18 UTC ++++ main.cpp +@@ -292,9 +292,9 @@ int main(int argc, char **argv) + } + argsconc += "\"rootcheck=no\""; + argsconcSingleQuote += "'rootcheck=no'"; +-#ifdef Q_OS_LINUX ++#ifdef Q_OS_UNIX + QString gksuarg1; +- gksuarg1 += QString("bash -c 'QT_X11_NO_MITSHM=1 "); ++ gksuarg1 += QString("sh -c 'QT_X11_NO_MITSHM=1 "); + gksuarg1 += QString("%1 %2").arg(app.applicationFilePath()).arg(argsconc); + gksuarg1 += QString("'"); + QStringList gksuargs; +@@ -370,7 +370,7 @@ int main(int argc, char **argv) + #ifdef Q_OS_WIN32 + QSettings chkinst("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\UNetbootin", QSettings::NativeFormat); + #endif +- #ifdef Q_OS_LINUX ++ #ifdef Q_OS_UNIX + QSettings chkinst(QSettings::SystemScope, "UNetbootin"); + #endif + #ifndef Q_OS_MAC +@@ -405,7 +405,7 @@ int main(int argc, char **argv) + icon.addFile(":/unetbootin_24.png", QSize(24,24)); + icon.addFile(":/unetbootin_32.png", QSize(32,32)); + icon.addFile(":/unetbootin_48.png", QSize(48,48)); +-#ifdef Q_OS_LINUX ++#ifdef Q_OS_UNIX + icon.addFile("/usr/share/pixmaps/unetbootin.png"); + icon.addFile("/usr/share/pixmaps/unetbootin.xpm"); + #endif diff --git a/sysutils/unetbootin/files/patch-unetbootin.cpp b/sysutils/unetbootin/files/patch-unetbootin.cpp new file mode 100644 index 000000000000..7d64a05b9ac3 --- /dev/null +++ b/sysutils/unetbootin/files/patch-unetbootin.cpp @@ -0,0 +1,243 @@ +--- unetbootin.cpp.orig 2017-07-14 08:54:12 UTC ++++ unetbootin.cpp +@@ -301,8 +301,13 @@ bool unetbootin::ubninitialize(QList<QPair<QString, QS + #endif + sevzcommand = locatecommand("7z", tr("either"), "p7zip-full"); + #endif // Q_OS_LINUX ++#ifdef Q_OS_FREEBSD ++ syslinuxcommand = locatecommand("syslinux", tr("FAT32-formatted USB drive"), "syslinux"); ++ sevzcommand = locatecommand("7z", tr("either"), "p7zip"); ++ mke2fscommand = locatecommand("mke2fs", tr("LiveUSB persistence"), "e2fsprogs"); ++#endif // Q_OS_FREEBSD + ubntmpf = QDir::toNativeSeparators(QString("%1/").arg(QDir::tempPath())); +- #ifdef Q_OS_LINUX ++ #ifdef Q_OS_UNIX + if (ubntmpf.isEmpty() || ubntmpf == "/") + { + ubntmpf = "/tmp/"; +@@ -649,6 +654,57 @@ QStringList unetbootin::listsanedrives() + } + */ + #endif ++#ifdef Q_OS_FREEBSD ++ struct xvfsconf fsconf; ++ struct statfs *fslist; ++ ++ /* ++ * Find out VFS number assigned by kernel for MSDOSFS. ++ * This helps to ensure that it is configured with the ++ * kernel. As a nice side effect, this also allows to ++ * compare a number instead of "msdosfs" string later. ++ */ ++ if (getvfsbyname("msdosfs", &fsconf) == -1) ++ goto out; ++ ++ /* ++ * Quick sanity check of the number of active mountpoints ++ * using the filesystem (we need mounted storage to work). ++ */ ++ if (fsconf.vfc_refcount < 1) ++ goto out; ++ ++ int numfs = getmntinfo(&fslist, MNT_NOWAIT); ++ if (numfs < 1) ++ goto out; ++ ++ QRegExp pendrives_sdcards("^/dev/(da|mmcsd)\\d+"); ++ ++ for (int i = 0; i < numfs; ++i) ++ { ++ /* ++ * We're interested in MSDOSFS (FAT) filesystems ++ * that are mounted off removable storage (e.g., ++ * USB memsticks, SD cards). Assume that device ++ * names for those are /dev/da* and /dev/mmcsd*. ++ * (Perhaps not entirely accurate assumption.) ++ */ ++ if ((int)fslist[i].f_type == fsconf.vfc_typenum && ++ QString(fslist[i].f_mntfromname) ++ .contains(pendrives_sdcards)) ++ { ++ /* ++ * Unlike other implementations above, we ++ * append tuples of device name *and* the ++ * mount point, so we do not have to find ++ * mount point separately later. ++ */ ++ fulldrivelist.append(QString("%1:%2") ++ .arg(fslist[i].f_mntfromname) ++ .arg(fslist[i].f_mntonname)); ++ } ++ } ++#endif + #ifdef Q_OS_MAC + QString systemprofilertext = callexternapp("system_profiler", "SPStorageDataType"); + QRegExp filesystemregex("File System: (.+)\\n"); +@@ -669,6 +725,7 @@ for (int i = 0; i < filesystemlist.size(); ++i) + } + #endif + } ++out: + return fulldrivelist; + } + +@@ -1100,7 +1157,12 @@ bool unetbootin::checkifoutofspace(QString destindir) + struct statfs diskstatS; + if (!statfs(QString(destindir+"/.").toAscii(), &diskstatS)) + { +- if (diskstatS.f_bavail * diskstatS.f_bfree < 1024) ++ /* ++ * Refuse to work if available disk space is less than 1MB ++ * (1024KB). Even this seems very low, but original value ++ * of 1024 bytes was simply ridiculous. ++ */ ++ if (diskstatS.f_bsize / 1024 * diskstatS.f_bavail < 1024) + outofspace = true; + } + #endif +@@ -3412,21 +3474,36 @@ void unetbootin::instIndvfl(QString srcfName, QString + srcF.setFileName(QFile::exists("/usr/share/syslinux/memdisk") ? "/usr/share/syslinux/memdisk" : "/usr/lib/syslinux/memdisk"); + else if (srcfName == "menu.c32") + { ++#ifdef Q_OS_LINUX + srcF.setFileName(QFile::exists("/usr/share/syslinux/menu.c32") ? "/usr/share/syslinux/menu.c32" : "/usr/lib/syslinux/menu.c32"); + if (QFile::exists("/usr/lib/syslinux/modules/bios/menu.c32")) + srcF.setFileName("/usr/lib/syslinux/modules/bios/menu.c32"); ++#endif ++#ifdef Q_OS_FREEBSD ++ srcF.setFileName(LOCALBASE "/share/syslinux/bios/com32/menu/menu.c32"); ++#endif + } + else if (srcfName == "libutil.c32") + { ++#ifdef Q_OS_LINUX + srcF.setFileName(QFile::exists("/usr/share/syslinux/libutil.c32") ? "/usr/share/syslinux/libutil.c32" : "/usr/lib/syslinux/libutil.c32"); + if (QFile::exists("/usr/lib/syslinux/modules/bios/libutil.c32")) + srcF.setFileName("/usr/lib/syslinux/modules/bios/libutil.c32"); ++#endif ++#ifdef Q_OS_FREEBSD ++ srcF.setFileName(LOCALBASE "/share/syslinux/bios/com32/libutil/libutil.c32"); ++#endif + } + else if (srcfName == "libcom32.c32") + { ++#ifdef Q_OS_LINUX + srcF.setFileName(QFile::exists("/usr/share/syslinux/libcom32.c32") ? "/usr/share/syslinux/libcom32.c32" : "/usr/lib/syslinux/libcom32.c32"); + if (QFile::exists("/usr/lib/syslinux/modules/bios/libcom32.c32")) + srcF.setFileName("/usr/lib/syslinux/modules/bios/libcom32.c32"); ++#endif ++#ifdef Q_OS_FREEBSD ++ srcF.setFileName(LOCALBASE "/share/syslinux/bios/com32/lib/libcom32.c32"); ++#endif + } + else if (srcfName == "mbr.bin") + { +@@ -3516,11 +3593,19 @@ void unetbootin::runinst() + } + if (installType == tr("USB Drive")) + { ++#ifdef Q_OS_LINUX + targetDev = driveselect->currentText(); + devluid = getdevluid(targetDev); + ginstallDir = ""; + installDir = ginstallDir; + targetDrive = QString("%1/").arg(locatemountpoint(targetDev)); ++#endif ++#ifdef Q_OS_FREEBSD ++ QStringList driveinfo = driveselect->currentText().split(":"); ++ targetDev = driveinfo.at(0); ++ installDir = ginstallDir = ""; ++ targetDrive = QString("%1/").arg(driveinfo.at(1)); ++#endif + } + #ifdef Q_OS_LINUX + if (targetDev.contains(QRegExp("p\\d$"))) +@@ -3528,7 +3613,7 @@ void unetbootin::runinst() + else + rawtargetDev = QString(targetDev).remove(QRegExp("\\d$")); + #endif +-#ifdef Q_OS_MAC ++#ifdef Q_OS_UNIX + rawtargetDev = QString(targetDev).remove(QRegExp("s\\d$")); + #endif + #endif +@@ -4281,21 +4366,47 @@ void unetbootin::runinstusb() + instIndvfl("libutil.c32", QString("%1libutil.c32").arg(targetPath)); + instIndvfl("libcom32.c32", QString("%1libcom32.c32").arg(targetPath)); + } ++ setuppersspace(); ++#ifdef Q_OS_FREEBSD ++ /* ++ * On FreeBSD, we only support installing on MSDOSFS (no ++ * extlinux in the ports). This also simplifies things ++ * a bit, and that's what most users usually want anyway. ++ * ++ * Because of syslinux' stupidity, we have to remove any ++ * existing ldlinux.c32 and ldlinux.sys files, otherwise ++ * it will fail to install loader (even with -f switch). ++ * Then we have to unmount the filesystem to avoid the ++ * "Operation not permitted" error, and must enforce it ++ * because syslinux expects a block device, and, well, ++ * there are no "block devices" in FreeBSD. ++ */ ++ rmFile(targetPath + "ldlinux.c32"); ++ rmFile(targetPath + "ldlinux.sys"); ++ callexternapp("umount", targetDev); ++ callexternapp(syslinuxcommand, "-i -f " + targetDev); ++ ++ if (rawtargetDev != targetDev) ++ { ++ /* ++ * We have partition table (not operating on raw ++ * disk), so we need to install MBR and mark our ++ * partition as active. Assume our targetDev is ++ * /dev/{da,mmcsd}XsY and use the last digit as ++ * partition index for gpart(8). ++ */ ++ QString idx = targetDev.right(1); ++ callexternapp("gpart", ++ "bootcode -b /boot/mbr " + rawtargetDev); ++ callexternapp("gpart", "set -a " ++ "active -i " + idx + " " + rawtargetDev); ++ } ++#endif + fininstall(); + } + +-void unetbootin::killApplication() ++void unetbootin::setuppersspace() + { +- exit(0); +-} +- +-void unetbootin::fininstall() +-{ +- #ifdef Q_OS_UNIX +- this->tprogress->setValue(this->tprogress->maximum()*2/3); +- pdesc1->setText(tr("Syncing filesystems")); +- callexternapp("sync", ""); +- #endif + if (this->persistenceSpaceMB > 0) + { + pdesc1->setText(tr("Setting up persistence")); +@@ -4334,6 +4445,20 @@ void unetbootin::fininstall() + rmFile(mke2fscommand); + #endif + } ++} ++ ++void unetbootin::killApplication() ++{ ++ exit(0); ++} ++ ++void unetbootin::fininstall() ++{ ++ #ifdef Q_OS_UNIX ++ this->tprogress->setValue(this->tprogress->maximum()*2/3); ++ pdesc1->setText(tr("Syncing filesystems")); ++ callexternapp("sync", ""); ++ #endif + pdesc1->setText(""); + progresslayer->setEnabled(false); + progresslayer->hide(); diff --git a/sysutils/unetbootin/files/patch-unetbootin.h b/sysutils/unetbootin/files/patch-unetbootin.h new file mode 100644 index 000000000000..3c5a375419f8 --- /dev/null +++ b/sysutils/unetbootin/files/patch-unetbootin.h @@ -0,0 +1,21 @@ +--- unetbootin.h.orig 2017-07-14 05:31:37 UTC ++++ unetbootin.h +@@ -35,6 +35,10 @@ This program is distributed in the hope that it will b + #include <sys/vfs.h> + #endif + ++#ifdef Q_OS_FREEBSD ++#include <sys/mount.h> ++#endif ++ + #ifdef AUTOSUPERGRUBDISK + #define UNETBOOTINB "Auto Super Grub Disk" + #define NOEXTERN +@@ -333,6 +337,7 @@ class unetbootin : public QWidget, private Ui::unetboo + void logText(const QString &text); + void finishLogging(); + void writeTextToFile(const QString &text, const QString &filePath); ++ void setuppersspace(); + void fininstall(); + void rmFile(const QString &fn); + void rmFile(QFile &fn); diff --git a/sysutils/unetbootin/pkg-descr b/sysutils/unetbootin/pkg-descr new file mode 100644 index 000000000000..1c3243a715fb --- /dev/null +++ b/sysutils/unetbootin/pkg-descr @@ -0,0 +1,6 @@ +UNetbootin allows to create bootable Live USB drives for Ubuntu, Fedora, +and other Linux distributions without burning a CD. This is useful when +supplied ISO image cannot be directly written to USB drive or SD card to +get a bootable media. + +WWW: http://unetbootin.sourceforge.net/ diff --git a/sysutils/unetbootin/pkg-message b/sysutils/unetbootin/pkg-message new file mode 100644 index 000000000000..0d461173cf3b --- /dev/null +++ b/sysutils/unetbootin/pkg-message @@ -0,0 +1,3 @@ + If SysLinux refuses to boot with a "Boot error" message when written to + a PC partition (slice), try to reformat the drive in raw (or dedicated) + mode (that is, without a partition table), then reinstall things again. diff --git a/sysutils/unetbootin/pkg-plist b/sysutils/unetbootin/pkg-plist new file mode 100644 index 000000000000..9d823004dda3 --- /dev/null +++ b/sysutils/unetbootin/pkg-plist @@ -0,0 +1,63 @@ +bin/unetbootin +share/icons/hicolor/16x16/apps/unetbootin.png +share/icons/hicolor/22x22/apps/unetbootin.png +share/icons/hicolor/24x24/apps/unetbootin.png +share/icons/hicolor/32x32/apps/unetbootin.png +share/icons/hicolor/48x48/apps/unetbootin.png +share/icons/hicolor/64x64/apps/unetbootin.png +share/icons/hicolor/128x128/apps/unetbootin.png +share/icons/hicolor/192x192/apps/unetbootin.png +share/icons/hicolor/256x256/apps/unetbootin.png +share/icons/hicolor/512x512/apps/unetbootin.png +share/pixmaps/unetbootin.xpm +%%DATADIR%%/unetbootin_am.qm +%%DATADIR%%/unetbootin_ar.qm +%%DATADIR%%/unetbootin_ast.qm +%%DATADIR%%/unetbootin_be.qm +%%DATADIR%%/unetbootin_bg.qm +%%DATADIR%%/unetbootin_bn.qm +%%DATADIR%%/unetbootin_ca.qm +%%DATADIR%%/unetbootin_cs.qm +%%DATADIR%%/unetbootin_da.qm +%%DATADIR%%/unetbootin_de.qm +%%DATADIR%%/unetbootin_el.qm +%%DATADIR%%/unetbootin_eo.qm +%%DATADIR%%/unetbootin_es.qm +%%DATADIR%%/unetbootin_et.qm +%%DATADIR%%/unetbootin_eu.qm +%%DATADIR%%/unetbootin_fa.qm +%%DATADIR%%/unetbootin_fi.qm +%%DATADIR%%/unetbootin_fo.qm +%%DATADIR%%/unetbootin_fr.qm +%%DATADIR%%/unetbootin_gl.qm +%%DATADIR%%/unetbootin_he.qm +%%DATADIR%%/unetbootin_hr.qm +%%DATADIR%%/unetbootin_hu.qm +%%DATADIR%%/unetbootin_id.qm +%%DATADIR%%/unetbootin_it.qm +%%DATADIR%%/unetbootin_ja.qm +%%DATADIR%%/unetbootin_lt.qm +%%DATADIR%%/unetbootin_lv.qm +%%DATADIR%%/unetbootin_ml.qm +%%DATADIR%%/unetbootin_ms.qm +%%DATADIR%%/unetbootin_nan.qm +%%DATADIR%%/unetbootin_nb.qm +%%DATADIR%%/unetbootin_nl.qm +%%DATADIR%%/unetbootin_nn.qm +%%DATADIR%%/unetbootin_pl.qm +%%DATADIR%%/unetbootin_pt.qm +%%DATADIR%%/unetbootin_pt_BR.qm +%%DATADIR%%/unetbootin_ro.qm +%%DATADIR%%/unetbootin_ru.qm +%%DATADIR%%/unetbootin_si.qm +%%DATADIR%%/unetbootin_sk.qm +%%DATADIR%%/unetbootin_sl.qm +%%DATADIR%%/unetbootin_sr.qm +%%DATADIR%%/unetbootin_sv.qm +%%DATADIR%%/unetbootin_sw.qm +%%DATADIR%%/unetbootin_tr.qm +%%DATADIR%%/unetbootin_uk.qm +%%DATADIR%%/unetbootin_ur.qm +%%DATADIR%%/unetbootin_vi.qm +%%DATADIR%%/unetbootin_zh_CN.qm +%%DATADIR%%/unetbootin_zh_TW.qm diff --git a/sysutils/zap/Makefile b/sysutils/zap/Makefile index ed90e146a6fb..02ec8e2e0ad1 100644 --- a/sysutils/zap/Makefile +++ b/sysutils/zap/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= zap -DISTVERSION= 0.7.2 +DISTVERSION= 0.7.3 CATEGORIES= sysutils MAINTAINER= jrm@FreeBSD.org diff --git a/sysutils/zap/distinfo b/sysutils/zap/distinfo index cea4bd5996e2..6635da3f6eba 100644 --- a/sysutils/zap/distinfo +++ b/sysutils/zap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1504120292 -SHA256 (Jehops-zap-0.7.2_GH0.tar.gz) = af9d5fe9d776e4253436b1aba5d4eafa1d29ef0b1dc6c1d25d5e2400530049bc -SIZE (Jehops-zap-0.7.2_GH0.tar.gz) = 7861 +TIMESTAMP = 1504572828 +SHA256 (Jehops-zap-0.7.3_GH0.tar.gz) = d28bd276fd3a91c951a8165e401e15be54ddb514347e1e6eefa3543a46dbac31 +SIZE (Jehops-zap-0.7.3_GH0.tar.gz) = 7842 |