1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00

Update to version 0.3.0 -- patch-ab is no longer needed.

This commit is contained in:
Jim Mock 2001-04-04 16:45:16 +00:00
parent 63713f51b5
commit ab1f01876c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=40843
8 changed files with 30 additions and 92 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= teapop
PORTVERSION= 0.28
PORTREVISION= 1
PORTVERSION= 0.3.0
CATEGORIES= mail
MASTER_SITES= ftp://ftp.toontown.org/pub/teapop/ \
http://www.toontown.org/pub/teapop/

View File

@ -1 +1 @@
MD5 (teapop-0.28.tar.gz) = 666d0c9c80d1d15b1cae72c988e4d0c8
MD5 (teapop-0.3.0.tar.gz) = a49265e190c2ddab6914471dabd955c0

View File

@ -1,21 +1,21 @@
--- etc/Makefile.in.orig Sat Mar 10 19:51:58 2001
+++ etc/Makefile.in Sat Mar 10 19:55:01 2001
--- etc/Makefile.in.orig Wed Apr 4 12:39:19 2001
+++ etc/Makefile.in Wed Apr 4 12:41:14 2001
@@ -23,15 +23,9 @@
fi
install: build
- @echo Checking for existing teapop.passwd; \
- if [ -f ${sysconfdir}/teapop.passwd ]; then \
- echo "Exists...NOT installing teapop.passwd"; \
- else \
- echo "Not found, installing teapop.passwd"; \
- ${INSTALL} -d ${sysconfdir}; \
- ${INSTALL} teapop.passwd ${sysconfdir}; \
- ${CHMOD} 0755 ${sysconfdir}/teapop.passwd; \
- @ echo Checking for existing teapop.passwd; \
- if [ -f ${sysconfdir}/teapop.passwd ]; then \
- echo "Exists...NOT installing teapop.passwd"; \
- else \
- echo "Not found, installing teapop.passwd"; \
- ${INSTALL} -d ${sysconfdir}; \
- ${INSTALL} teapop.passwd ${sysconfdir}; \
- ${CHMOD} 0755 ${sysconfdir}/teapop.passwd; \
- fi
+ @echo Installing teapop.passwd.sample; \
+ ${INSTALL} -d ${sysconfdir}
+ ${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample;
+ ${INSTALL} -d ${sysconfdir}; \
+ ${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample; \
makefile: ../config/timestamp
@echo Updating Makefile
@ echo Updating Makefile

View File

@ -1,30 +0,0 @@
--- teapop/pop_auth.c.orig Mon Nov 13 02:03:11 2000
+++ teapop/pop_auth.c Wed Mar 28 23:58:33 2001
@@ -111,7 +111,11 @@
#endif /* ALLOW_APOP */
pop_cmd_capa(NULL, pinfo);
continue;
+#ifdef ALLOW_APOP
case 4:
+#else
+ case 3:
+#endif /* ALLOW_APOP */
return 1;
}
/* If we get this far we have a good USER or APOP */
@@ -158,7 +162,14 @@
#ifdef VPOP
ptr = pop_string_find(pinfo->userid, DIVIDERS);
- if (ptr != NULL) {
+ if (ptr == NULL) {
+ syslog(LOG_ERR, "pop_auth: malloc failure");
+ pop_socket_send(pinfo->out, "%s %s", POP_ERR,
+ POP_WRONG);
+ exit(0);
+ }
+ if (*ptr != '\0') {
+ /* domain delimiters found */
strcpy(pinfo->domain, ptr+1);
*ptr = '\0';
} else

View File

@ -6,8 +6,7 @@
#
PORTNAME= teapop
PORTVERSION= 0.28
PORTREVISION= 1
PORTVERSION= 0.3.0
CATEGORIES= mail
MASTER_SITES= ftp://ftp.toontown.org/pub/teapop/ \
http://www.toontown.org/pub/teapop/

View File

@ -1 +1 @@
MD5 (teapop-0.28.tar.gz) = 666d0c9c80d1d15b1cae72c988e4d0c8
MD5 (teapop-0.3.0.tar.gz) = a49265e190c2ddab6914471dabd955c0

View File

@ -1,21 +1,21 @@
--- etc/Makefile.in.orig Sat Mar 10 19:51:58 2001
+++ etc/Makefile.in Sat Mar 10 19:55:01 2001
--- etc/Makefile.in.orig Wed Apr 4 12:39:19 2001
+++ etc/Makefile.in Wed Apr 4 12:41:14 2001
@@ -23,15 +23,9 @@
fi
install: build
- @echo Checking for existing teapop.passwd; \
- if [ -f ${sysconfdir}/teapop.passwd ]; then \
- echo "Exists...NOT installing teapop.passwd"; \
- else \
- echo "Not found, installing teapop.passwd"; \
- ${INSTALL} -d ${sysconfdir}; \
- ${INSTALL} teapop.passwd ${sysconfdir}; \
- ${CHMOD} 0755 ${sysconfdir}/teapop.passwd; \
- @ echo Checking for existing teapop.passwd; \
- if [ -f ${sysconfdir}/teapop.passwd ]; then \
- echo "Exists...NOT installing teapop.passwd"; \
- else \
- echo "Not found, installing teapop.passwd"; \
- ${INSTALL} -d ${sysconfdir}; \
- ${INSTALL} teapop.passwd ${sysconfdir}; \
- ${CHMOD} 0755 ${sysconfdir}/teapop.passwd; \
- fi
+ @echo Installing teapop.passwd.sample; \
+ ${INSTALL} -d ${sysconfdir}
+ ${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample;
+ ${INSTALL} -d ${sysconfdir}; \
+ ${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample; \
makefile: ../config/timestamp
@echo Updating Makefile
@ echo Updating Makefile

View File

@ -1,30 +0,0 @@
--- teapop/pop_auth.c.orig Mon Nov 13 02:03:11 2000
+++ teapop/pop_auth.c Wed Mar 28 23:58:33 2001
@@ -111,7 +111,11 @@
#endif /* ALLOW_APOP */
pop_cmd_capa(NULL, pinfo);
continue;
+#ifdef ALLOW_APOP
case 4:
+#else
+ case 3:
+#endif /* ALLOW_APOP */
return 1;
}
/* If we get this far we have a good USER or APOP */
@@ -158,7 +162,14 @@
#ifdef VPOP
ptr = pop_string_find(pinfo->userid, DIVIDERS);
- if (ptr != NULL) {
+ if (ptr == NULL) {
+ syslog(LOG_ERR, "pop_auth: malloc failure");
+ pop_socket_send(pinfo->out, "%s %s", POP_ERR,
+ POP_WRONG);
+ exit(0);
+ }
+ if (*ptr != '\0') {
+ /* domain delimiters found */
strcpy(pinfo->domain, ptr+1);
*ptr = '\0';
} else