16822 – Upgrade to ddup 2.2Dm

Bug 16822 - Upgrade to ddup 2.2Dm

Summary: Upgrade to ddup 2.2Dm

Status:	Closed FIXED

Alias:	None

Product:	Ports & Packages
Classification:	Unclassified
Component:	Individual Port(s) (show other bugs)
Version:	Latest
Hardware:	Any Any

Importance:	Normal Affects Only Me
Assignee:	taoka

URL:
Keywords:

Depends on:
Blocks:

Reported:	2000-02-19 19:20 UTC by cjm2
Modified:	2000-02-23 02:54 UTC (History)
CC List:	0 users

See Also:

Attachments
file.diff (6.67 KB, patch) 2000-02-19 19:20 UTC, cjm2	no flags	Details \| Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description cjm2 2000-02-19 19:20:01 UTC

	Upgrade of port to version 2.2Dm.  Adds BASE64 encoding to the
	the password in the configfile.  Also master site and web page
	have changed.

How-To-Repeat: 
	See Fix

Comment 1 taoka freebsd_committer

2000-02-20 16:19:28 UTC

Responsible Changed
From-To: freebsd-ports->taoka

I'll take this

Comment 2 Christopher J. Michaels 2000-02-23 00:15:38 UTC

Corrections to original submission are as follows.





diff -ruN ddup.bak/Makefile ddup/Makefile
--- ddup.bak/Makefile	Fri Feb 11 02:01:58 2000
+++ ddup/Makefile	Tue Feb 22 19:08:26 2000
@@ -6,26 +6,45 @@
 # $FreeBSD: ports/net/ddup/Makefile,v 1.4 2000/02/10 23:15:48 jedgar Exp $
 #
 
-DISTNAME=	ddup-2.1
+DISTNAME=	ddup-2.2
 CATEGORIES=	net
-MASTER_SITES=	ftp://gandy.dyndns.org/pub/ddup/ \
-		http://www.phix.com/~java/
+MASTER_SITES=	ftp://ddup.sourceforge.net/pub/ddup/
+DISTFILES=	ddup-2.2Dm.tar.gz
 
 MAINTAINER=	cjm2@altavista.net
 
-WRKSRC=		${WRKDIR}/ddup-nic
-
 MAN1=		ddup.1
 MANCOMPRESSED=	yes
 
+WRKSRC=		${WRKDIR}/ddup-2.2Dm
+
+# Uncomment this if you want to enable debugging.
+#DEBUG=		-g
+
+pre-build:
+	${ECHO} "char *file_name = \"${PREFIX}/etc/ddup.conf\";" > ${WRKSRC}/options.h
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c ddup.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c ddup_functions.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c getopt.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c getopt1.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c parse_config.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c parse_option.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c update.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -o ddup ddup.o ddup_functions.o getopt.o getopt1.o parse_config.o parse_option.o update.o ${LIBS}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ddup ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/testip ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/ddup.1.gz ${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/ddup.conf ${PREFIX}/etc/ddup.conf.default
+	${INSTALL_MAN} ${WRKSRC}/ddup.1.gz ${PREFIX}/man/man1
 	${MKDIR} ${PREFIX}/share/doc/ddup
 	${INSTALL_MAN} ${WRKSRC}/INSTALL-C ${PREFIX}/share/doc/ddup
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/ddup
+	${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/ddup
+
+post-install:
 	strip ${PREFIX}/sbin/ddup
+	${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff -ruN ddup.bak/files/md5 ddup/files/md5
--- ddup.bak/files/md5	Fri Feb 11 02:01:58 2000
+++ ddup/files/md5	Tue Feb 22 18:58:42 2000
@@ -1 +1 @@
-MD5 (ddup-2.1.tar.gz) = 3dd30ae02503b23b47a61e428ac9fdcb
+MD5 (ddup-2.2Dm.tar.gz) = d05ac8fda0409d8e9bb8e964aa94104c
diff -ruN ddup.bak/patches/patch-ab ddup/patches/patch-ab
--- ddup.bak/patches/patch-ab	Fri Feb 11 02:01:58 2000
+++ ddup/patches/patch-ab	Wed Dec 31 19:00:00 1969
@@ -1,49 +0,0 @@
---- Makefile.orig	Mon Jan 31 21:08:49 2000
-+++ Makefile	Wed Feb  9 18:56:37 2000
-@@ -2,14 +2,14 @@
- # $Id: Makefile,v 2.6 2000/02/01 02:07:43 thomas Exp thomas $
- # Change these options
- 
--CC = gcc
--INSTALL_PATH = /usr/sbin/bin
-+CC ?= gcc
-+INSTALL_PATH = ${PREFIX}/sbin
- 
- # DEBUG = -g
- DEBUG =
- 
- # For Linux and others
--DEFINES =
-+DEFINES = -DCONFIGFILE=\"${PREFIX}/etc/ddup.conf\"
- LIBS =
- 
- # For AIX
-@@ -21,22 +21,22 @@
- all : ddup
- 
- ddup : ddup.o parse_config.o parse_option.o getopt.o getopt1.o
--	${CC} ${DEFINES} ${DEBUG} -o ddup ddup.o getopt.o getopt1.o parse_config.o parse_option.o ${LIBS}
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -o ddup ddup.o getopt.o getopt1.o parse_config.o parse_option.o ${LIBS}
- 
- ddup.o : ddup.c
--	${CC} ${DEFINES} ${DEBUG} -c ddup.c
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -c ddup.c
- 
- getopt.o : getopt.c
--	${CC} ${DEFINES} ${DEBUG} -c getopt.c
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -c getopt.c
- 
- getopt1.o : getopt1.c
--	${CC} ${DEFINES} ${DEBUG} -c getopt1.c
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -c getopt1.c
- 
- parse_config.o : parse_config.c
--	${CC} ${DEFINES} ${DEBUG} -c parse_config.c
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -c parse_config.c
- 
- parse_option.o : parse_option.c
--	${CC} ${DEFINES} ${DEBUG} -c parse_option.c
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -c parse_option.c
- 
- install : ddup
- 	cp ddup ${INSTALL_PATH}/ddup
diff -ruN ddup.bak/patches/patch-ac ddup/patches/patch-ac
--- ddup.bak/patches/patch-ac	Fri Feb 11 02:01:58 2000
+++ ddup/patches/patch-ac	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- parse_config.c.orig	Mon Jan 17 16:56:33 2000
-+++ parse_config.c	Wed Feb  9 18:57:17 2000
-@@ -18,7 +18,7 @@
- void read_config(char **username_ptr, char **pass_ptr)
- {
-   FILE *fptr;
--  char *file_name = "/etc/ddup.conf";
-+  char *file_name = CONFIGFILE;
-   char line[1024];
-   char *string;
-   int x = 0;
diff -ruN ddup.bak/patches/patch-ad ddup/patches/patch-ad
--- ddup.bak/patches/patch-ad	Thu Feb 10 18:15:53 2000
+++ ddup/patches/patch-ad	Tue Feb 22 18:58:42 2000
@@ -1,28 +1,16 @@
---- testip.orig	Wed Feb  9 19:06:02 2000
-+++ testip	Wed Feb  9 19:07:11 2000
-@@ -3,11 +3,13 @@
- # This defines the host as the first argument (eg. testip gandy.dyndns.org
- # makes HOST = gandy.dyndns.org
+--- testip.orig	Sat Feb 19 13:31:53 2000
++++ testip	Sat Feb 19 13:33:40 2000
+@@ -5,7 +5,7 @@
  HOST=$1
-+
  # Change IFACE to your network interface name
--IFACE="ppp0"
-+IFACE="tun0"
- IFCHECK=$(/sbin/ifconfig|grep -1 $IFACE|cut -s -d ' ' -f12|grep addr|cut -d ':' -f2)
-+
+ IFACE="tun0"
+-IFCHECK=$(/sbin/ifconfig|grep -1 $IFACE|cut -s -d ' ' -f12|grep addr|cut -d ':' -f2)
++IFCHECK=$(/sbin/ifconfig -a|grep -1 $IFACE|cut -s -d ' ' -f12|grep addr|cut -d ':' -f2)
  # This line uses the 'host' command to check DNS you can comment this out
--#if you use the nslookup one
-+# if you use the nslookup one
+ #if you use the nslookup one
  DNSCHECK=$(host $HOST|cut -d ' ' -f4)
- 
- # This line uses the 'nslookup' command to check DNS you can uncomment
-@@ -18,7 +20,6 @@
- 	echo "We're ok"
- else	
- 	# This can be changed for proxy support or mx check the manpage
--	#for options
--	/etc/ppp/ddup --host $HOST --wildcard
-+	# for options
-+	/usr/local/sbin/ddup --host $HOST --wildcard
+@@ -21,4 +21,3 @@
+ 	#for options
+ 	/usr/local/sbin/ddup --host $HOST --wildcard
  fi
 -	
diff -ruN ddup.bak/pkg/DESCR ddup/pkg/DESCR
--- ddup.bak/pkg/DESCR	Fri Feb 11 02:01:58 2000
+++ ddup/pkg/DESCR	Tue Feb 22 18:58:42 2000
@@ -4,7 +4,6 @@
 DD-UP is a program that is used to update a host
 provided by the Free DynDNS service of dyndns.org.
 
-WWW: http://www.gandy.dyndns.org/~thomas/ddup.shtml
+WWW: http://ddup.sourceforce.net/
 
-- Chris
-cjm2@altavista.net
+EMAIL: cjm2@altavista.net
diff -ruN ddup.bak/pkg/MESSAGE ddup/pkg/MESSAGE
--- ddup.bak/pkg/MESSAGE	Wed Dec 31 19:00:00 1969
+++ ddup/pkg/MESSAGE	Tue Feb 22 18:58:42 2000
@@ -0,0 +1,10 @@
+********************************************************
+*** If you are upgrading or are a first time user    ***
+*** you MUST make your configuration file by typing  ***
+*** ddup --makeconf                                  ***
+********************************************************
+********************************************************
+*** If you are upgrading or are a first time user    ***
+*** you MUST make your configuration file by typing  ***
+*** ddup --makeconf                                  ***
+********************************************************
diff -ruN ddup.bak/pkg/PLIST ddup/pkg/PLIST
--- ddup.bak/pkg/PLIST	Fri Feb 11 02:01:58 2000
+++ ddup/pkg/PLIST	Tue Feb 22 18:58:42 2000
@@ -1,6 +1,6 @@
-etc/ddup.conf.default
 sbin/ddup
 sbin/testip
 share/doc/ddup/README
 share/doc/ddup/INSTALL-C
+share/doc/ddup/COPYING
 @dirrm share/doc/ddup

Comment 3 Christopher J. Michaels 2000-02-23 00:17:51 UTC

Corrections are as follows...

diff -ruN ddup.bak/Makefile ddup/Makefile
--- ddup.bak/Makefile	Fri Feb 11 02:01:58 2000
+++ ddup/Makefile	Tue Feb 22 19:08:26 2000
@@ -6,26 +6,45 @@
 # $FreeBSD: ports/net/ddup/Makefile,v 1.4 2000/02/10 23:15:48 jedgar Exp $
 #
 
-DISTNAME=	ddup-2.1
+DISTNAME=	ddup-2.2
 CATEGORIES=	net
-MASTER_SITES=	ftp://gandy.dyndns.org/pub/ddup/ \
-		http://www.phix.com/~java/
+MASTER_SITES=	ftp://ddup.sourceforge.net/pub/ddup/
+DISTFILES=	ddup-2.2Dm.tar.gz
 
 MAINTAINER=	cjm2@altavista.net
 
-WRKSRC=		${WRKDIR}/ddup-nic
-
 MAN1=		ddup.1
 MANCOMPRESSED=	yes
 
+WRKSRC=		${WRKDIR}/ddup-2.2Dm
+
+# Uncomment this if you want to enable debugging.
+#DEBUG=		-g
+
+pre-build:
+	${ECHO} "char *file_name = \"${PREFIX}/etc/ddup.conf\";" > ${WRKSRC}/options.h
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c ddup.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c ddup_functions.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c getopt.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c getopt1.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c parse_config.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c parse_option.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -c update.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${DEBUG} -o ddup ddup.o ddup_functions.o getopt.o getopt1.o parse_config.o parse_option.o update.o ${LIBS}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ddup ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/testip ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/ddup.1.gz ${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/ddup.conf ${PREFIX}/etc/ddup.conf.default
+	${INSTALL_MAN} ${WRKSRC}/ddup.1.gz ${PREFIX}/man/man1
 	${MKDIR} ${PREFIX}/share/doc/ddup
 	${INSTALL_MAN} ${WRKSRC}/INSTALL-C ${PREFIX}/share/doc/ddup
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/ddup
+	${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/ddup
+
+post-install:
 	strip ${PREFIX}/sbin/ddup
+	${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff -ruN ddup.bak/files/md5 ddup/files/md5
--- ddup.bak/files/md5	Fri Feb 11 02:01:58 2000
+++ ddup/files/md5	Tue Feb 22 18:58:42 2000
@@ -1 +1 @@
-MD5 (ddup-2.1.tar.gz) = 3dd30ae02503b23b47a61e428ac9fdcb
+MD5 (ddup-2.2Dm.tar.gz) = d05ac8fda0409d8e9bb8e964aa94104c
diff -ruN ddup.bak/patches/patch-ab ddup/patches/patch-ab
--- ddup.bak/patches/patch-ab	Fri Feb 11 02:01:58 2000
+++ ddup/patches/patch-ab	Wed Dec 31 19:00:00 1969
@@ -1,49 +0,0 @@
---- Makefile.orig	Mon Jan 31 21:08:49 2000
-+++ Makefile	Wed Feb  9 18:56:37 2000
-@@ -2,14 +2,14 @@
- # $Id: Makefile,v 2.6 2000/02/01 02:07:43 thomas Exp thomas $
- # Change these options
- 
--CC = gcc
--INSTALL_PATH = /usr/sbin/bin
-+CC ?= gcc
-+INSTALL_PATH = ${PREFIX}/sbin
- 
- # DEBUG = -g
- DEBUG =
- 
- # For Linux and others
--DEFINES =
-+DEFINES = -DCONFIGFILE=\"${PREFIX}/etc/ddup.conf\"
- LIBS =
- 
- # For AIX
-@@ -21,22 +21,22 @@
- all : ddup
- 
- ddup : ddup.o parse_config.o parse_option.o getopt.o getopt1.o
--	${CC} ${DEFINES} ${DEBUG} -o ddup ddup.o getopt.o getopt1.o parse_config.o parse_option.o ${LIBS}
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -o ddup ddup.o getopt.o getopt1.o parse_config.o parse_option.o ${LIBS}
- 
- ddup.o : ddup.c
--	${CC} ${DEFINES} ${DEBUG} -c ddup.c
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -c ddup.c
- 
- getopt.o : getopt.c
--	${CC} ${DEFINES} ${DEBUG} -c getopt.c
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -c getopt.c
- 
- getopt1.o : getopt1.c
--	${CC} ${DEFINES} ${DEBUG} -c getopt1.c
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -c getopt1.c
- 
- parse_config.o : parse_config.c
--	${CC} ${DEFINES} ${DEBUG} -c parse_config.c
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -c parse_config.c
- 
- parse_option.o : parse_option.c
--	${CC} ${DEFINES} ${DEBUG} -c parse_option.c
-+	${CC} ${CFLAGS} ${DEFINES} ${DEBUG} -c parse_option.c
- 
- install : ddup
- 	cp ddup ${INSTALL_PATH}/ddup
diff -ruN ddup.bak/patches/patch-ac ddup/patches/patch-ac
--- ddup.bak/patches/patch-ac	Fri Feb 11 02:01:58 2000
+++ ddup/patches/patch-ac	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- parse_config.c.orig	Mon Jan 17 16:56:33 2000
-+++ parse_config.c	Wed Feb  9 18:57:17 2000
-@@ -18,7 +18,7 @@
- void read_config(char **username_ptr, char **pass_ptr)
- {
-   FILE *fptr;
--  char *file_name = "/etc/ddup.conf";
-+  char *file_name = CONFIGFILE;
-   char line[1024];
-   char *string;
-   int x = 0;
diff -ruN ddup.bak/patches/patch-ad ddup/patches/patch-ad
--- ddup.bak/patches/patch-ad	Thu Feb 10 18:15:53 2000
+++ ddup/patches/patch-ad	Tue Feb 22 18:58:42 2000
@@ -1,28 +1,16 @@
---- testip.orig	Wed Feb  9 19:06:02 2000
-+++ testip	Wed Feb  9 19:07:11 2000
-@@ -3,11 +3,13 @@
- # This defines the host as the first argument (eg. testip gandy.dyndns.org
- # makes HOST = gandy.dyndns.org
+--- testip.orig	Sat Feb 19 13:31:53 2000
++++ testip	Sat Feb 19 13:33:40 2000
+@@ -5,7 +5,7 @@
  HOST=$1
-+
  # Change IFACE to your network interface name
--IFACE="ppp0"
-+IFACE="tun0"
- IFCHECK=$(/sbin/ifconfig|grep -1 $IFACE|cut -s -d ' ' -f12|grep addr|cut -d ':' -f2)
-+
+ IFACE="tun0"
+-IFCHECK=$(/sbin/ifconfig|grep -1 $IFACE|cut -s -d ' ' -f12|grep addr|cut -d ':' -f2)
++IFCHECK=$(/sbin/ifconfig -a|grep -1 $IFACE|cut -s -d ' ' -f12|grep addr|cut -d ':' -f2)
  # This line uses the 'host' command to check DNS you can comment this out
--#if you use the nslookup one
-+# if you use the nslookup one
+ #if you use the nslookup one
  DNSCHECK=$(host $HOST|cut -d ' ' -f4)
- 
- # This line uses the 'nslookup' command to check DNS you can uncomment
-@@ -18,7 +20,6 @@
- 	echo "We're ok"
- else	
- 	# This can be changed for proxy support or mx check the manpage
--	#for options
--	/etc/ppp/ddup --host $HOST --wildcard
-+	# for options
-+	/usr/local/sbin/ddup --host $HOST --wildcard
+@@ -21,4 +21,3 @@
+ 	#for options
+ 	/usr/local/sbin/ddup --host $HOST --wildcard
  fi
 -	
diff -ruN ddup.bak/pkg/DESCR ddup/pkg/DESCR
--- ddup.bak/pkg/DESCR	Fri Feb 11 02:01:58 2000
+++ ddup/pkg/DESCR	Tue Feb 22 18:58:42 2000
@@ -4,7 +4,6 @@
 DD-UP is a program that is used to update a host
 provided by the Free DynDNS service of dyndns.org.
 
-WWW: http://www.gandy.dyndns.org/~thomas/ddup.shtml
+WWW: http://ddup.sourceforce.net/
 
-- Chris
-cjm2@altavista.net
+EMAIL: cjm2@altavista.net
diff -ruN ddup.bak/pkg/MESSAGE ddup/pkg/MESSAGE
--- ddup.bak/pkg/MESSAGE	Wed Dec 31 19:00:00 1969
+++ ddup/pkg/MESSAGE	Tue Feb 22 18:58:42 2000
@@ -0,0 +1,10 @@
+********************************************************
+*** If you are upgrading or are a first time user    ***
+*** you MUST make your configuration file by typing  ***
+*** ddup --makeconf                                  ***
+********************************************************
+********************************************************
+*** If you are upgrading or are a first time user    ***
+*** you MUST make your configuration file by typing  ***
+*** ddup --makeconf                                  ***
+********************************************************
diff -ruN ddup.bak/pkg/PLIST ddup/pkg/PLIST
--- ddup.bak/pkg/PLIST	Fri Feb 11 02:01:58 2000
+++ ddup/pkg/PLIST	Tue Feb 22 18:58:42 2000
@@ -1,6 +1,6 @@
-etc/ddup.conf.default
 sbin/ddup
 sbin/testip
 share/doc/ddup/README
 share/doc/ddup/INSTALL-C
+share/doc/ddup/COPYING
 @dirrm share/doc/ddup

Comment 4 taoka freebsd_committer

2000-02-23 02:51:24 UTC

State Changed
From-To: open->closed

Committed, thanks! 
(You should point out specifically new files and removed files in PR)