Backport from current for no-ip-2.1.9

Fixes CVE-2008-5297
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5297

Ian McWilliam
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/no-ip/Makefile,v
retrieving revision 1.12
retrieving revision 1.15
diff -u -a -r1.12 -r1.15
--- Makefile    23 Oct 2007 08:27:14 -0000      1.12
+++ Makefile    23 Nov 2008 09:36:30 -0000      1.15
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2007/10/23 08:27:14 wilfried Exp $
+# $OpenBSD: Makefile,v 1.15 2008/11/23 09:36:30 wilfried Exp $
 
 COMMENT=               No-IP.com Dynamic DNS client
 
-V=                     2.1.7
+V=                     2.1.9
 DISTNAME=              noip-${V}
 PKGNAME=               no-ip-${V}
 CATEGORIES=            net
@@ -25,7 +25,7 @@
 ALL_TARGET=            noip2
 
 do-configure:
-       @perl -pi -e 's|_SYSCONFDIR_|${SYSCONFDIR}|g' ${WRKSRC}/noip2.c
+       @${SUBST_CMD} ${WRKSRC}/noip2.c
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKBUILD}/noip2 ${PREFIX}/sbin
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/no-ip/distinfo,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -a -r1.10 -r1.13
--- distinfo    23 Oct 2007 08:27:14 -0000      1.10
+++ distinfo    23 Nov 2008 09:36:30 -0000      1.13
@@ -1,5 +1,5 @@
-MD5 (noip-2.1.7.tar.gz) = e2tkwIcIwrFHw3XdoHSo3A==
-RMD160 (noip-2.1.7.tar.gz) = ulUBw4lyplfdVcVqDq5eRuB3wC4=
-SHA1 (noip-2.1.7.tar.gz) = 9DNWo3qBpTg4Kppdm2IE+WzA/lc=
-SHA256 (noip-2.1.7.tar.gz) = EQWiPLCpV8Sx58R72b/tAPGgib3d0qafab9PgEf3ojc=
-SIZE (noip-2.1.7.tar.gz) = 147640
+MD5 (noip-2.1.9.tar.gz) = 7tjp757ft93Dbhh96Gf+ZA==
+RMD160 (noip-2.1.9.tar.gz) = UD8aalLBx1PIfzW5+WFvXwPy26s=
+SHA1 (noip-2.1.9.tar.gz) = u67ipPfeolER9RBLajSUgEhA1qw=
+SHA256 (noip-2.1.9.tar.gz) = hq0KY2ImOjP1mmWNGxzkKOJVVW3a0NBiqg7kt/QS+Yo=
+SIZE (noip-2.1.9.tar.gz) = 152995
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/net/no-ip/patches/patch-Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -a -r1.4 -r1.5
--- patches/patch-Makefile      18 Oct 2006 22:02:39 -0000      1.4
+++ patches/patch-Makefile      20 Nov 2008 07:49:51 -0000      1.5
@@ -1,12 +1,13 @@
-$OpenBSD: patch-Makefile,v 1.4 2006/10/18 22:02:39 wilfried Exp $
---- Makefile.orig      Fri Feb 24 17:45:51 2006
-+++ Makefile   Wed Oct 18 23:58:14 2006
-@@ -1,16 +1,15 @@
+$OpenBSD: patch-Makefile,v 1.5 2008/11/20 07:49:51 wilfried Exp $
+--- Makefile.orig      Thu Nov 13 02:31:49 2008
++++ Makefile   Thu Nov 20 08:40:53 2008
+@@ -1,5 +1,4 @@
  TGT=noip2
 -CC=gcc
+ PKG=noip-2.1.tgz
  
  PREFIX=/usr/local
- CONFDIR=${PREFIX}/etc
+@@ -7,11 +6,11 @@ CONFDIR=${PREFIX}/etc
  BINDIR=${PREFIX}/bin
  
  # these defines are for Linux
@@ -21,12 +22,12 @@
  
  # for early BSD systems without getifaddrs(), uncomment the next line
  #ARCH=bsd
-@@ -21,7 +20,7 @@ ARCH=linux
+@@ -22,7 +21,7 @@ ARCH=linux
  # ARCH=sun
  
  ${TGT}: Makefile ${TGT}.c 
--      ${CC} -Wall -g -O2 -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} 
${LIBS}
-+      ${CC} ${CFLAGS} -D${ARCH} ${TGT}.c -o ${TGT} ${LIBS}
+-      ${CC} -Wall -g -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} 
${LIBS}
++      ${CC} -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
  
  install: ${TGT} 
        if [ ! -d ${BINDIR} ]; then mkdir -p ${BINDIR};fi
Index: patches/patch-noip2_c
===================================================================
RCS file: /cvs/ports/net/no-ip/patches/patch-noip2_c,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -a -r1.5 -r1.7
--- patches/patch-noip2_c       23 Oct 2007 08:27:14 -0000      1.5
+++ patches/patch-noip2_c       23 Nov 2008 09:36:30 -0000      1.7
@@ -1,17 +1,17 @@
-$OpenBSD: patch-noip2_c,v 1.5 2007/10/23 08:27:14 wilfried Exp $
---- noip2.c.orig       Mon Aug 27 23:54:19 2007
-+++ noip2.c    Tue Oct 23 09:49:14 2007
-@@ -218,11 +218,8 @@
- #define NODNSGROUP            "@@NO_GROUP@@"
+$OpenBSD: patch-noip2_c,v 1.7 2008/11/23 09:36:30 wilfried Exp $
+--- noip2.c.orig       Fri Nov 21 23:19:54 2008
++++ noip2.c    Sun Nov 23 10:33:56 2008
+@@ -232,11 +232,8 @@
  #define HOST                  1
  #define GROUP                 2
+ #define DOMAIN                        3
 -#ifndef PREFIX
 -  #define PREFIX              "/usr/local"
 -#endif
 -#define CONFIG_FILEPATH               PREFIX"/etc"
 -#define CONFIG_FILENAME               PREFIX"/etc/no-ip2.conf"
-+#define CONFIG_FILEPATH               "_SYSCONFDIR_"
-+#define CONFIG_FILENAME               "_SYSCONFDIR_/no-ip2.conf"
++#define CONFIG_FILEPATH               "${SYSCONFDIR}"
++#define CONFIG_FILENAME               "${SYSCONFDIR}/no-ip2.conf"
  #define CONFSTRLEN            1024
  #define MAX_DEVLEN            16
  #define MAX_INSTANCE          4
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/no-ip/pkg/PLIST,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -a -r1.5 -r1.6
--- pkg/PLIST   14 Oct 2004 14:11:51 -0000      1.5
+++ pkg/PLIST   20 Nov 2008 07:49:51 -0000      1.6
@@ -1,5 +1,5 @@
-...@comment $OpenBSD: PLIST,v 1.5 2004/10/14 14:11:51 xsa Exp $
-sbin/noip2
+...@comment $OpenBSD: PLIST,v 1.6 2008/11/20 07:49:51 wilfried Exp $
+...@bin sbin/noip2
 share/doc/no-ip/
 share/doc/no-ip/README.FIRST
 share/examples/no-ip/

Reply via email to