Update to wmMultiPop3-0.8, from maintainer Jolan Luff <jolan@enteract.com>

- new HOMEPAGE
- patches to port were incorporated by the upstream author
- ability to run a command when there's new mail
This commit is contained in:
wilfried 2002-07-15 07:00:31 +00:00
parent e9cf15b045
commit 8dbf4296ec
5 changed files with 11 additions and 187 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.2 2002/06/07 18:47:43 wilfried Exp $
# $OpenBSD: Makefile,v 1.3 2002/07/15 07:00:31 wilfried Exp $
COMMENT= "wm-dockapp; multiple pop3 mailbox checker"
DISTNAME= wmMultiPop3-0.7
DISTNAME= wmMultiPop3-0.8
PKGNAME= ${DISTNAME:L}
CATEGORIES= mail x11/windowmaker
NEED_VERSION= 1.515
HOMEPAGE= http://sumpan.campus.luth.se/software/wmmultipop3/
HOMEPAGE= http://bart.sm.luth.se/~dansun-8/software/wmMultiPop3/
MAINTAINER= Jolan Luff <jolan@enteract.com>

View File

@ -1,3 +1,3 @@
MD5 (wmMultiPop3-0.7.tar.gz) = e7464e5939a856beff42fd7f414daa34
RMD160 (wmMultiPop3-0.7.tar.gz) = 8c8a560b481fedb62b176386d03aec3ad9d40c3e
SHA1 (wmMultiPop3-0.7.tar.gz) = 4b314426fb6e5667f1a8340706db1807e32a86d6
MD5 (wmMultiPop3-0.8.tar.gz) = 23f9351e7c0cabf2aa18f405a2e9b8fd
RMD160 (wmMultiPop3-0.8.tar.gz) = ea30b23797370448c006c3a40a0f289f4ecc9713
SHA1 (wmMultiPop3-0.8.tar.gz) = c84ea9070b61aa48b6d20346471f69059af7087f

View File

@ -1,6 +1,7 @@
--- wmmultipop3/Makefile.orig Sat Sep 22 17:29:50 2001
+++ wmmultipop3/Makefile Tue Apr 30 09:26:54 2002
@@ -1,16 +1,16 @@
$OpenBSD: patch-wmmultipop3_Makefile,v 1.2 2002/07/15 07:00:32 wilfried Exp $
--- wmmultipop3/Makefile.orig Sun May 26 12:43:33 2002
+++ wmmultipop3/Makefile Sun Jul 14 00:00:02 2002
@@ -1,14 +1,14 @@
-LIBDIR = -L/usr/X11R6/lib
+LIBDIR = -L${X11BASE}/lib
LIBS = -lXpm -lXext -lX11
@ -16,8 +17,5 @@
- cc $(FLAGS) -o wmmultipop3 $^ -lXext $(LIBDIR) $(LIBS)
+ ${CC} -o wmmultipop3 ${OBJS} ${LIBDIR} ${LIBS}
-all:: wmpop3
+all:: wmmultipop3
all:: wmmultipop3
clean::
for i in $(OBJS) ; do \

View File

@ -1,50 +0,0 @@
$OpenBSD:
--- wmmultipop3/Pop3Client.c.orig Fri Aug 13 17:56:19 1999
+++ wmmultipop3/Pop3Client.c Mon Feb 12 17:48:41 2001
@@ -42,8 +42,8 @@ Pop3 pop3Create(void){
pc = (Pop3)malloc( sizeof(*pc) );
if( pc == 0)
return 0;
- strcpy(pc->password , "");
- strcpy(pc->userName , "");
+ pc->password[0] = '\0';
+ pc->userName[0] = '\0';
pc->connected = NOT_CONNECTED;
pc->serverPort = 110;
pc->localPort = 0;
@@ -96,7 +96,7 @@ int pop3Login(Pop3 pc, char *name, char
return -1;
}
- sprintf(pc->outBuf,"USER %s\r\n",name);
+ snprintf(pc->outBuf,sizeof(pc->outBuf),"USER %s\r\n",name);
send(pc->s, &pc->outBuf,strlen(pc->outBuf),0);
size =recv(pc->s,pc->inBuf,1024,0);
memset(temp,0,1024);
@@ -107,7 +107,7 @@ int pop3Login(Pop3 pc, char *name, char
}
memset(pc->outBuf,0,1024);
- sprintf(pc->outBuf,"PASS %s\r\n",pass);
+ snprintf(pc->outBuf,sizeof(pc->outBuf),"PASS %s\r\n",pass);
send(pc->s, pc->outBuf, strlen(pc->outBuf),0 );
size =recv(pc->s,&pc->inBuf,1024,0);
memset(temp,0,1024);
@@ -128,7 +128,7 @@ int pop3CheckMail(Pop3 pc){
return -1;
/* Find total number of messages in mail box */
- sprintf(pc->outBuf,"STAT\r\n");
+ snprintf(pc->outBuf,sizeof(pc->outBuf),"STAT\r\n");
send(pc->s, pc->outBuf, strlen(pc->outBuf),0 );
size =recv(pc->s,pc->inBuf,1024,0);
memset(temp,0,1024);
@@ -142,7 +142,7 @@ int pop3CheckMail(Pop3 pc){
return -1;
}
- sprintf(pc->outBuf,"LAST\r\n");
+ snprintf(pc->outBuf,sizeof(pc->outBuf),"LAST\r\n");
send(pc->s, pc->outBuf, strlen(pc->outBuf),0 );
size =recv(pc->s,pc->inBuf,1024,0);
memset(temp,0,1024);

View File

@ -1,123 +0,0 @@
--- wmmultipop3/wmmultipop3.c.orig Sat Sep 22 17:29:50 2001
+++ wmmultipop3/wmmultipop3.c Tue Apr 30 09:16:39 2002
@@ -60,7 +60,7 @@ typedef struct {
char password[STR_LENGTH];
char username[STR_LENGTH];
char popserver[4*STR_LENGTH];
- char mailserverid[2];
+ char mailserverid[4];
int port;
int nMsgs;
int nUnread;
@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
case 'c' :
if (argc > (i+1))
{
- strcpy(config_file, argv[i+1]);
+ strlcpy(config_file, argv[i+1], sizeof(config_file));
i++;
}
break;
@@ -178,7 +178,7 @@ void wmCheckMail_routine(int argc, char
/* Find config-file */
if( !strcmp( config_file, "not-defined") ) {
- sprintf(config_file, "%s/.wmmultipop3rc", getenv("HOME"));
+ snprintf(config_file, sizeof(config_file), "%s/.wmmultipop3rc", getenv("HOME"));
}
/* Read config */
@@ -451,7 +451,7 @@ int readConfigFile(char *filename) {
/* If we don't have a configfile, output a new one */
if ( (fp = fopen( filename, "r" )) == 0) {
- sprintf(config_file, "%s/.wmmultipop3rc", getenv("HOME"));
+ snprintf(config_file, sizeof(config_file), "%s/.wmmultipop3rc", getenv("HOME"));
printf("-Config file does not exit : %s\n",config_file);
printf("+Trying to create new config file.\n");
if((fp = fopen(config_file,"w")) == 0){
@@ -524,7 +524,7 @@ int readConfigFile(char *filename) {
printf("Error in mailclient string\n");
return -1;
}
- strcpy(conf.mailclient, ptr);
+ strlcpy(conf.mailclient, ptr, sizeof(conf.mailclient));
}
if ( !strcmp(ptr, "middle_click_cmd") ) {
ptr = strtok( 0, "\n");
@@ -532,7 +532,7 @@ int readConfigFile(char *filename) {
printf("Error in middle_click_cmd string\n");
return -1;
}
- strcpy(conf.middle_click_cmd, ptr);
+ strlcpy(conf.middle_click_cmd, ptr, sizeof(conf.middle_click_cmd));
}
if ( !strcmp(ptr, "right_click_cmd") ) {
ptr = strtok( 0, "\n");
@@ -540,7 +540,7 @@ int readConfigFile(char *filename) {
printf("Error in right_click_cmd string\n");
return -1;
}
- strcpy(conf.right_click_cmd, ptr);
+ strlcpy(conf.right_click_cmd, ptr, sizeof(conf.right_click_cmd));
}
if ( !strcmp(ptr, "popserver") ) {
@@ -553,7 +553,7 @@ int readConfigFile(char *filename) {
if (popservers > 0)
conf.c = (MailServerConf **)realloc(conf.c,(popservers+1)*sizeof(MailServerConf));
conf.c[popservers]=(MailServerConf *)malloc(sizeof(MailServerConf));
- strcpy(conf.c[popservers]->popserver, ptr);
+ strlcpy(conf.c[popservers]->popserver, ptr, sizeof(conf.c[popservers]->popserver));
/* conf.c[popservers]->nMailWaiting=0;*/
popservers++;
}
@@ -572,7 +572,7 @@ int readConfigFile(char *filename) {
printf("Error in username string\n");
return -1;
}
- strcpy(conf.c[usernames]->username, ptr);
+ strlcpy(conf.c[usernames]->username, ptr, sizeof(conf.c[usernames]->username));
usernames++;
}
if ( !strcmp(ptr, "password") ) {
@@ -581,7 +581,7 @@ int readConfigFile(char *filename) {
printf("Error in password string\n");
return -1;
}
- strcpy(conf.c[passwords]->password, ptr);
+ strlcpy(conf.c[passwords]->password, ptr, sizeof(conf.c[passwords]->password));
passwords++;
}
if ( !strcmp(ptr, "mailserverid") ) {
@@ -590,7 +590,7 @@ int readConfigFile(char *filename) {
printf("Error in mail-server ID string\n");
return -1;
}
- strcpy(conf.c[ids]->mailserverid, ptr);
+ strlcpy(conf.c[ids]->mailserverid, ptr, sizeof(conf.c[ids]->mailserverid));
ids++;
}
}
@@ -600,10 +600,10 @@ int readConfigFile(char *filename) {
to mailclient (eg. left mouse click). This will preserve compability with
configfiles belonging to older versions of wmmultipop3 */
if ( strlen( conf.middle_click_cmd ) < 1 ) {
- strcpy( conf.middle_click_cmd, conf.mailclient );
+ strlcpy(conf.middle_click_cmd, conf.mailclient, sizeof(conf.middle_click_cmd));
}
if ( strlen( conf.right_click_cmd ) < 1 ) {
- strcpy( conf.right_click_cmd, conf.mailclient );
+ strlcpy(conf.right_click_cmd, conf.mailclient, sizeof(conf.right_click_cmd));
}
conf.nMailBoxes = popservers;
@@ -697,7 +697,7 @@ void BlitNum(int num, int x, int y)
newx -= CHAR_WIDTH;
}
- sprintf(buf, "%02i", num);
+ snprintf(buf, sizeof(buf), "%02i", num);
BlitString(buf, newx, y);
}