yes, sorry I forgot that.
El 04/15/11 10:29, Antoine Jacoutot escribió:
On Fri, 15 Apr 2011, Gonzalo L. R. wrote:
Here is the update for Adsuck, with some bug fixes, and a clearly README to
play with dhclient-adsuck.
Use ${PREFIX} instead of hard-coding /usr/local in the README.
--
Sending from my Computer.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/adsuck/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile 18 Mar 2011 13:13:59 -0000 1.16
+++ Makefile 15 Apr 2011 13:46:21 -0000
@@ -1,30 +1,30 @@
# $OpenBSD: Makefile,v 1.16 2011/03/18 13:13:59 ajacoutot Exp $
-COMMENT= DNS relay for ad blocking
+COMMENT= DNS relay for ad blocking
-DISTNAME= adsuck-2.2
-CATEGORIES= net
+DISTNAME= adsuck-2.3
+CATEGORIES= net
-HOMEPAGE= http://opensource.conformal.com/wiki/Adsuck
-MAINTAINER= Gonzalo L. R. <gonz...@x61.com.ar>
-EXTRACT_SUFX= .tgz
+HOMEPAGE= http://opensource.conformal.com/wiki/Adsuck
+MAINTAINER= Gonzalo L. R. <gonz...@x61.com.ar>
+EXTRACT_SUFX= .tgz
# BSD
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE_FTP= Yes
+PERMIT_DISTFILES_CDROM= Yes
+PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://opensource.conformal.com/snapshots/adsuck/
+MASTER_SITES= http://opensource.conformal.com/snapshots/adsuck/
WANTLIB += c event ldns
-LIB_DEPENDS= net/ldns/libldns>=1.6.5
+LIB_DEPENDS= net/ldns/libldns>=1.6.5
-MAKE_FLAGS= BINDIR="${TRUEPREFIX}/sbin" \
- MANDIR="${TRUEPREFIX}/man/cat"
+MAKE_FLAGS= BINDIR="${TRUEPREFIX}/sbin" \
+ MANDIR="${TRUEPREFIX}/man/cat"
_files= Hosts.blc Hosts.rsk regex \
- Hosts.pub Hosts.trc hosts.small resolv.conf
+ Hosts.pub Hosts.trc hosts.small resolv.conf
pre-configure:
${SUBST_CMD} ${WRKSRC}/dhclient-adsuck
@@ -35,6 +35,7 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/adsuck
${INSTALL_DATA} ${WRKSRC}/files/README ${PREFIX}/share/doc/adsuck
${INSTALL_DATA} ${WRKSRC}/dhclient-adsuck ${PREFIX}/sbin
+ @chmod 555 ${PREFIX}/sbin/dhclient-adsuck
.for _f in ${_files}
${INSTALL_DATA} ${WRKSRC}/files/${_f} ${PREFIX}/share/examples/adsuck
.endfor
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/adsuck/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo 18 Mar 2011 13:13:59 -0000 1.9
+++ distinfo 15 Apr 2011 13:46:21 -0000
@@ -1,5 +1,5 @@
-MD5 (adsuck-2.2.tgz) = sjUrhkZ5UI9K2j+Co7+R7Q==
-RMD160 (adsuck-2.2.tgz) = Y45fUSjFIKdyPOv8o0R5VabMfmg=
-SHA1 (adsuck-2.2.tgz) = gZ0KuXWr0b9GpZOElh58S+hAM68=
-SHA256 (adsuck-2.2.tgz) = tBTm7xiSlHn9hcisRwu8ymSgaZAWlP5EnOTsw4iYhjs=
-SIZE (adsuck-2.2.tgz) = 2740496
+MD5 (adsuck-2.3.tgz) = PdwRWYq345elVVz2WeZKCQ==
+RMD160 (adsuck-2.3.tgz) = xToZg4RsUOtsgOg+YG0zMSA8Rt0=
+SHA1 (adsuck-2.3.tgz) = dM6Ttz9neiJ8WFqtihmQp7vFdRE=
+SHA256 (adsuck-2.3.tgz) = ZoNn7xfrSldFt6+OjuNZztIT1d7cgsJzvnEUQL2Wqe0=
+SIZE (adsuck-2.3.tgz) = 2320307
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/adsuck/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 18 Mar 2011 13:13:59 -0000 1.4
+++ pkg/PLIST 15 Apr 2011 13:46:21 -0000
@@ -3,7 +3,7 @@
@newuser _adsuck:620:_adsuck:daemon:adsuck Daemon:/var/empty:/sbin/nologin
@man man/cat8/adsuck.0
@bin sbin/adsuck
-sbin/dhclient-adsuck
+@bin sbin/dhclient-adsuck
share/adsuck/
share/doc/adsuck/
share/doc/adsuck/README
Index: pkg/README
===================================================================
RCS file: /cvs/ports/net/adsuck/pkg/README,v
retrieving revision 1.2
diff -u -r1.2 README
--- pkg/README 18 Mar 2011 13:13:59 -0000 1.2
+++ pkg/README 15 Apr 2011 13:46:21 -0000
@@ -14,7 +14,10 @@
Provided that adsuck(1) is installed and adsuck_flags is not set to "NO"
in rc.conf.local(5), this script will prevent from using
/etc/resolv.conf to resolve non-blacklisted entries but use
-/var/adsuck/files/resolv.conf instead.
+/var/adsuck/files/resolv.conf instead. For a proper use you want to add
+this line in your /etc/dhclient.conf:
+
+ script "${PREFIX}/sbin/dhclient-adsuck";
Make sure that /etc/resolv.conf only contains:
