aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dns/utdns/Makefile12
-rw-r--r--dns/utdns/distinfo6
-rw-r--r--dns/utdns/files/patch-configure.ac10
-rw-r--r--dns/utdns/files/patch-src_utdns.c45
4 files changed, 19 insertions, 54 deletions
diff --git a/dns/utdns/Makefile b/dns/utdns/Makefile
index 6c593f89473a..3c1092682cdc 100644
--- a/dns/utdns/Makefile
+++ b/dns/utdns/Makefile
@@ -2,23 +2,23 @@
# $FreeBSD$
PORTNAME= utdns
-PORTVERSION= 1.0
-DISTVERSIONSUFFIX= .r1437
-PORTREVISION= 1
+PORTVERSION= 1.1
+DISTVERSIONPREFIX= v
CATEGORIES= dns
-MASTER_SITES= https://www.cypherpunk.at/download/utdns/ \
- LOCAL/ehaupt
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Proxy UDP/DNS to TCP/DNS
LICENSE= GPLv3
+USES= autoreconf
+USE_GITHUB= yes
GNU_CONFIGURE= yes
USE_RC_SUBR= ${PORTNAME}
-
SUB_LIST= PORTNAME=${PORTNAME}
+GH_ACCOUNT= rahra
+
CFLAGS+= -DSOCK_NONBLOCK=1
PLIST_FILES= bin/utdns
diff --git a/dns/utdns/distinfo b/dns/utdns/distinfo
index 479a0f8b4854..4565e371f1c5 100644
--- a/dns/utdns/distinfo
+++ b/dns/utdns/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531211131
-SHA256 (utdns-1.0.r1437.tar.gz) = fd2ab9846e722f937c291d9163c18fbcfc8439dabad895444770e4978a44c5cc
-SIZE (utdns-1.0.r1437.tar.gz) = 78377
+TIMESTAMP = 1531291522
+SHA256 (rahra-utdns-v1.1_GH0.tar.gz) = 67d67735d0eabff7438318654f422230ea2e3362cdbd2a44d596fdf22e85bde1
+SIZE (rahra-utdns-v1.1_GH0.tar.gz) = 9121
diff --git a/dns/utdns/files/patch-configure.ac b/dns/utdns/files/patch-configure.ac
new file mode 100644
index 000000000000..3df5c31bae2a
--- /dev/null
+++ b/dns/utdns/files/patch-configure.ac
@@ -0,0 +1,10 @@
+--- configure.ac.orig 2018-07-11 07:19:15 UTC
++++ configure.ac
+@@ -1,6 +1,5 @@
+ AC_PREREQ(2.67)
+-define([revision], esyscmd([sh -c "echo -n `git log | wc -l`"]))dnl
+-AC_INIT([utdns], [[1.1.r]revision], [bf@abenteuerland.at])
++AC_INIT([utdns], [1.1], [bf@abenteuerland.at])
+ AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+ AC_SUBST([CFLAGS], [["$CFLAGS -Wall -Wextra"]])
+ AC_PROG_CC
diff --git a/dns/utdns/files/patch-src_utdns.c b/dns/utdns/files/patch-src_utdns.c
deleted file mode 100644
index e5a77272a4b7..000000000000
--- a/dns/utdns/files/patch-src_utdns.c
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/utdns.c.orig 2013-04-17 08:20:51 UTC
-+++ src/utdns.c
-@@ -622,7 +622,8 @@ static void usage(const char *argv0)
- " -4 .......... Bind to IPv4 only instead of IP + IPv6.\n"
- " -b .......... Background process and log to syslog.\n"
- " -d .......... Set log level to LOG_DEBUG.\n"
-- " -p <port> ... Set incoming UDP port number.\n",
-+ " -p <port> ... Set incoming UDP port number.\n"
-+ " -P <port> ... Set destination port number.\n",
- argv0);
- }
-
-@@ -642,7 +643,8 @@ int main(int argc, char **argv)
- (void) init_log("stderr", debuglevel);
- #endif
-
-- while ((c = getopt(argc, argv, "4bdhp:")) != -1)
-+ int dst_port = 53;
-+ while ((c = getopt(argc, argv, "4bdhp:P:")) != -1)
- {
- switch (c)
- {
-@@ -665,6 +667,10 @@ int main(int argc, char **argv)
- case 'p':
- udp_port = atoi(optarg);
- break;
-+
-+ case 'P':
-+ dst_port = atoi(optarg);
-+ break;
- }
- }
-
-@@ -674,10 +680,9 @@ int main(int argc, char **argv)
- exit(EXIT_FAILURE);
- }
-
-- // FIXME: this should not be hardcoded
- memset(&in, 0, sizeof(in));
- in.sin_family = AF_INET;
-- in.sin_port = htons(53);
-+ in.sin_port = htons(dst_port);
- if (!inet_aton(argv[optind], &in.sin_addr))
- {
- log_msg(LOG_ERR, "could not convert %s to in_addr\n", argv[optind]);