Upgrade to 3.1.13

This commit is contained in:
Andrey A. Chernov 2001-05-18 12:44:57 +00:00
parent 71f9ddf14a
commit 33e0ea87da
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=42702
12 changed files with 21 additions and 114 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= mnogosearch
PORTVERSION= 3.1.12
PORTREVISION= 3
PORTVERSION= 3.1.13
CATEGORIES= www databases
MASTER_SITES= http://search.mnogo.ru/Download/
@ -24,6 +23,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-phrase \
--enable-shared \
--enable-freebsd-pthreads \
--with-openssl \
--sysconfdir=${PREFIX}/etc/mnogosearch \
--localstatedir=/var/mnogosearch

View file

@ -1 +1 @@
MD5 (mnogosearch-3.1.12.tar.gz) = bd008c8f671924198e251146c8f31ab6
MD5 (mnogosearch-3.1.13.tar.gz) = ca2300e5a00dae4f02a528b10b61ad6e

View file

@ -1,15 +1,6 @@
--- src/search.c.orig Wed Feb 28 15:28:10 2001
+++ src/search.c Mon Apr 23 06:46:50 2001
@@ -431,7 +431,7 @@
s=str+1;
while((*s)&&(isdigit(*s)))s++;
j=atoi(UdmTrim(s,"= \t\r\n"));
- if((i>0)&&(i<MAXRANDOM)){
+ if((i>=0)&&(i<MAXRANDOM)){
frand=rand();
frand=frand/RAND_MAX*j;
Randoms[i]=frand;
@@ -1225,7 +1225,7 @@
--- src/search.c.bak Tue May 15 13:08:14 2001
+++ src/search.c Fri May 18 16:22:44 2001
@@ -1239,7 +1239,7 @@
int i;
time_t tclock;
tclock=time(0);
@ -18,26 +9,3 @@
for(i=0;i<MAXRANDOM;i++)
Randoms[i]=0;
}
@@ -1269,7 +1269,8 @@
strcpy(template,env);
if((env=getenv("QUERY_STRING"))){
- strcpy(query_string,env);
+ strncpy(query_string,env,UDMSTRSIZ-1);
+ query_string[UDMSTRSIZ-1] = '\0';
if((env=getenv("REDIRECT_STATUS"))){
/* Check Apache internal redirect */
@@ -1316,8 +1317,10 @@
/* or under server which do not */
/* pass an empty QUERY_STRING var */
- if(argv[1])
- sprintf(query_string,"q=%s",argv[1]);
+ if(argv[1]) {
+ strcpy(query_string, "q=");
+ strncat(query_string, argv[1], UDMSTRSIZ-1-2);
+ }
if(!template[0])
sprintf(template,"%s/%s", UDM_CONF_DIR,"search.htm");
}

View file

@ -121,6 +121,7 @@ share/mnogosearch/create/pgsql/ispell.txt
share/mnogosearch/create/pgsql/multi.txt
share/mnogosearch/create/pgsql/news-extension.txt
share/mnogosearch/create/pgsql/server.txt
share/mnogosearch/create/pgsql/to_use_with_tags.txt
share/mnogosearch/create/pgsql/track.txt
share/mnogosearch/create/sapdb/README
share/mnogosearch/create/sapdb/categories.ins

View file

@ -6,8 +6,7 @@
#
PORTNAME= mnogosearch
PORTVERSION= 3.1.12
PORTREVISION= 3
PORTVERSION= 3.1.13
CATEGORIES= www databases
MASTER_SITES= http://search.mnogo.ru/Download/
@ -24,6 +23,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-phrase \
--enable-shared \
--enable-freebsd-pthreads \
--with-openssl \
--sysconfdir=${PREFIX}/etc/mnogosearch \
--localstatedir=/var/mnogosearch

View file

@ -1 +1 @@
MD5 (mnogosearch-3.1.12.tar.gz) = bd008c8f671924198e251146c8f31ab6
MD5 (mnogosearch-3.1.13.tar.gz) = ca2300e5a00dae4f02a528b10b61ad6e

View file

@ -1,15 +1,6 @@
--- src/search.c.orig Wed Feb 28 15:28:10 2001
+++ src/search.c Mon Apr 23 06:46:50 2001
@@ -431,7 +431,7 @@
s=str+1;
while((*s)&&(isdigit(*s)))s++;
j=atoi(UdmTrim(s,"= \t\r\n"));
- if((i>0)&&(i<MAXRANDOM)){
+ if((i>=0)&&(i<MAXRANDOM)){
frand=rand();
frand=frand/RAND_MAX*j;
Randoms[i]=frand;
@@ -1225,7 +1225,7 @@
--- src/search.c.bak Tue May 15 13:08:14 2001
+++ src/search.c Fri May 18 16:22:44 2001
@@ -1239,7 +1239,7 @@
int i;
time_t tclock;
tclock=time(0);
@ -18,26 +9,3 @@
for(i=0;i<MAXRANDOM;i++)
Randoms[i]=0;
}
@@ -1269,7 +1269,8 @@
strcpy(template,env);
if((env=getenv("QUERY_STRING"))){
- strcpy(query_string,env);
+ strncpy(query_string,env,UDMSTRSIZ-1);
+ query_string[UDMSTRSIZ-1] = '\0';
if((env=getenv("REDIRECT_STATUS"))){
/* Check Apache internal redirect */
@@ -1316,8 +1317,10 @@
/* or under server which do not */
/* pass an empty QUERY_STRING var */
- if(argv[1])
- sprintf(query_string,"q=%s",argv[1]);
+ if(argv[1]) {
+ strcpy(query_string, "q=");
+ strncat(query_string, argv[1], UDMSTRSIZ-1-2);
+ }
if(!template[0])
sprintf(template,"%s/%s", UDM_CONF_DIR,"search.htm");
}

View file

@ -121,6 +121,7 @@ share/mnogosearch/create/pgsql/ispell.txt
share/mnogosearch/create/pgsql/multi.txt
share/mnogosearch/create/pgsql/news-extension.txt
share/mnogosearch/create/pgsql/server.txt
share/mnogosearch/create/pgsql/to_use_with_tags.txt
share/mnogosearch/create/pgsql/track.txt
share/mnogosearch/create/sapdb/README
share/mnogosearch/create/sapdb/categories.ins

View file

@ -6,8 +6,7 @@
#
PORTNAME= mnogosearch
PORTVERSION= 3.1.12
PORTREVISION= 3
PORTVERSION= 3.1.13
CATEGORIES= www databases
MASTER_SITES= http://search.mnogo.ru/Download/
@ -24,6 +23,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-phrase \
--enable-shared \
--enable-freebsd-pthreads \
--with-openssl \
--sysconfdir=${PREFIX}/etc/mnogosearch \
--localstatedir=/var/mnogosearch

View file

@ -1 +1 @@
MD5 (mnogosearch-3.1.12.tar.gz) = bd008c8f671924198e251146c8f31ab6
MD5 (mnogosearch-3.1.13.tar.gz) = ca2300e5a00dae4f02a528b10b61ad6e

View file

@ -1,15 +1,6 @@
--- src/search.c.orig Wed Feb 28 15:28:10 2001
+++ src/search.c Mon Apr 23 06:46:50 2001
@@ -431,7 +431,7 @@
s=str+1;
while((*s)&&(isdigit(*s)))s++;
j=atoi(UdmTrim(s,"= \t\r\n"));
- if((i>0)&&(i<MAXRANDOM)){
+ if((i>=0)&&(i<MAXRANDOM)){
frand=rand();
frand=frand/RAND_MAX*j;
Randoms[i]=frand;
@@ -1225,7 +1225,7 @@
--- src/search.c.bak Tue May 15 13:08:14 2001
+++ src/search.c Fri May 18 16:22:44 2001
@@ -1239,7 +1239,7 @@
int i;
time_t tclock;
tclock=time(0);
@ -18,26 +9,3 @@
for(i=0;i<MAXRANDOM;i++)
Randoms[i]=0;
}
@@ -1269,7 +1269,8 @@
strcpy(template,env);
if((env=getenv("QUERY_STRING"))){
- strcpy(query_string,env);
+ strncpy(query_string,env,UDMSTRSIZ-1);
+ query_string[UDMSTRSIZ-1] = '\0';
if((env=getenv("REDIRECT_STATUS"))){
/* Check Apache internal redirect */
@@ -1316,8 +1317,10 @@
/* or under server which do not */
/* pass an empty QUERY_STRING var */
- if(argv[1])
- sprintf(query_string,"q=%s",argv[1]);
+ if(argv[1]) {
+ strcpy(query_string, "q=");
+ strncat(query_string, argv[1], UDMSTRSIZ-1-2);
+ }
if(!template[0])
sprintf(template,"%s/%s", UDM_CONF_DIR,"search.htm");
}

View file

@ -121,6 +121,7 @@ share/mnogosearch/create/pgsql/ispell.txt
share/mnogosearch/create/pgsql/multi.txt
share/mnogosearch/create/pgsql/news-extension.txt
share/mnogosearch/create/pgsql/server.txt
share/mnogosearch/create/pgsql/to_use_with_tags.txt
share/mnogosearch/create/pgsql/track.txt
share/mnogosearch/create/sapdb/README
share/mnogosearch/create/sapdb/categories.ins