SOURCES: mysqlBind-CC.patch (NEW), mysqlBind-makefile.patch, mysql...
blues
blues at pld-linux.org
Fri Sep 29 10:57:44 CEST 2006
Author: blues Date: Fri Sep 29 08:57:44 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.94, added CC patch (don't hadcode compiler)
---- Files affected:
SOURCES:
mysqlBind-CC.patch (NONE -> 1.1) (NEW), mysqlBind-makefile.patch (1.1 -> 1.2) , mysqlBind-paths.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/mysqlBind-CC.patch
diff -u /dev/null SOURCES/mysqlBind-CC.patch:1.1
--- /dev/null Fri Sep 29 10:57:44 2006
+++ SOURCES/mysqlBind-CC.patch Fri Sep 29 10:57:39 2006
@@ -0,0 +1,73 @@
+--- ./makefile.org 2006-09-29 08:52:55.000000000 +0000
++++ ./makefile 2006-09-29 08:54:57.000000000 +0000
+@@ -31,6 +31,7 @@
+ #CFLAGS=-O DFreeBSD -DLinux -Wall
+ CFLAGS= -DLinux -Wall
+ RELEASE = 1.94
++CC = cc
+
+ #FreeBSD make support un comment the next two lines. Yes you need both -D and the gmake
+ #define. Also check mysqlrad.h for FreeBSD parts and adjust for your system.
+@@ -53,49 +54,49 @@
+ all: mysqlBind.cgi
+
+ mysqlBind.cgi: tzone.o tresource.o trrtype.o tjob.o tnameserver.o tmailserver.o tconfiguration.o tclient.o tauthorize.o bind.o main.o cgi.o
+- cc tzone.o tresource.o trrtype.o tjob.o tnameserver.o tmailserver.o tconfiguration.o tclient.o tauthorize.o bind.o main.o cgi.o -o mysqlBind.cgi $(LIBS)
++ $(CC) tzone.o tresource.o trrtype.o tjob.o tnameserver.o tmailserver.o tconfiguration.o tclient.o tauthorize.o bind.o main.o cgi.o -o mysqlBind.cgi $(LIBS)
+
+ #Note use -lmsql if so defined in local.h
+ #-lmsql
+
+ tzone.o: tzone.c mysqlrad.h language.h tzonefunc.h
+- cc -c tzone.c -o tzone.o $(CFLAGS)
++ $(CC) -c tzone.c -o tzone.o $(CFLAGS)
+
+ tresource.o: tresource.c mysqlrad.h language.h tresourcefunc.h
+- cc -c tresource.c -o tresource.o $(CFLAGS)
++ $(CC) -c tresource.c -o tresource.o $(CFLAGS)
+
+ trrtype.o: trrtype.c mysqlrad.h language.h trrtypefunc.h
+- cc -c trrtype.c -o trrtype.o $(CFLAGS)
++ $(CC) -c trrtype.c -o trrtype.o $(CFLAGS)
+
+ tjob.o: tjob.c mysqlrad.h language.h tjobfunc.h
+- cc -c tjob.c -o tjob.o $(CFLAGS)
++ $(CC) -c tjob.c -o tjob.o $(CFLAGS)
+
+ tnameserver.o: tnameserver.c mysqlrad.h language.h tnameserverfunc.h
+- cc -c tnameserver.c -o tnameserver.o $(CFLAGS)
++ $(CC) -c tnameserver.c -o tnameserver.o $(CFLAGS)
+
+ tmailserver.o: tmailserver.c mysqlrad.h language.h tmailserverfunc.h
+- cc -c tmailserver.c -o tmailserver.o $(CFLAGS)
++ $(CC) -c tmailserver.c -o tmailserver.o $(CFLAGS)
+
+ tconfiguration.o: tconfiguration.c mysqlrad.h language.h tconfigurationfunc.h
+- cc -c tconfiguration.c -o tconfiguration.o $(CFLAGS)
++ $(CC) -c tconfiguration.c -o tconfiguration.o $(CFLAGS)
+
+ tclient.o: tclient.c mysqlrad.h language.h tclientfunc.h
+- cc -c tclient.c -o tclient.o $(CFLAGS)
++ $(CC) -c tclient.c -o tclient.o $(CFLAGS)
+
+ tauthorize.o: tauthorize.c mysqlrad.h language.h tauthorizefunc.h
+- cc -c tauthorize.c -o tauthorize.o $(CFLAGS)
++ $(CC) -c tauthorize.c -o tauthorize.o $(CFLAGS)
+
+
+ main.o: main.c mysqlrad.h mainfunc.h language.h local.h
+- cc -c main.c -o main.o $(CFLAGS)
++ $(CC) -c main.c -o main.o $(CFLAGS)
+
+ cgi.o: cgi.h cgi.c
+- cc -c cgi.c -o cgi.o $(CFLAGS)
++ $(CC) -c cgi.c -o cgi.o $(CFLAGS)
+
+ #List: bind.o
+ #Extra Link Command: -lmsql
+ bind.o: bind.c mysqlrad.h
+- cc -c bind.c -o bind.o $(CFLAGS)
++ $(CC) -c bind.c -o bind.o $(CFLAGS)
+
+ clean:
+ rm -f *.o
================================================================
Index: SOURCES/mysqlBind-makefile.patch
diff -u SOURCES/mysqlBind-makefile.patch:1.1 SOURCES/mysqlBind-makefile.patch:1.2
--- SOURCES/mysqlBind-makefile.patch:1.1 Thu Feb 26 16:24:54 2004
+++ SOURCES/mysqlBind-makefile.patch Fri Sep 29 10:57:39 2006
@@ -1,19 +1,22 @@
---- mysqlBind/makefile.orig Thu Feb 26 11:25:32 2004
-+++ mysqlBind/makefile Thu Feb 26 11:26:07 2004
-@@ -38,7 +38,7 @@
- ifdef FreeBSD
+--- ./makefile.org 2006-09-11 14:50:45.000000000 +0000
++++ ./makefile 2006-09-29 08:40:26.000000000 +0000
+@@ -43,9 +43,9 @@
LIBS= /usr/local/lib/mysql/libmysqlclient.a -lz -lm /usr/lib/libcrypt.a
else
-- LIBS= /usr/lib/mysql/libmysqlclient.a -lz -lcrypt -lm
-+ LIBS= -lmysqlclient -lz -lcrypt -lm
+ ifdef SSL
+- LIBS= /usr/lib/mysql/libmysqlclient.a -lz -lcrypt -lm -lssl
++ LIBS= -lmysqlclient -lz -lcrypt -lm -lssl
+ else
+- LIBS= /usr/lib/mysql/libmysqlclient.a -lz -lcrypt -lm
++ LIBS= -lmysqlclient -lz -lcrypt -lm
+ endif
endif
+@@ -54,7 +54,6 @@
-@@ -49,7 +49,6 @@
- cc tzone.o tresource.o trrtype.o tjob.o tnameserver.o tmailserver.o tconfiguration.o tclient.o tauthorize.o \
- bind.o\
- main.o cgi.o -o mysqlBind.cgi $(LIBS)
-- mail -s mysqlBind$(RELEASE) support at openisp.net < /dev/null > /dev/null 2>&1
+ mysqlBind.cgi: tzone.o tresource.o trrtype.o tjob.o tnameserver.o tmailserver.o tconfiguration.o tclient.o tauthorize.o bind.o main.o cgi.o
+ cc tzone.o tresource.o trrtype.o tjob.o tnameserver.o tmailserver.o tconfiguration.o tclient.o tauthorize.o bind.o main.o cgi.o -o mysqlBind.cgi $(LIBS)
+-# mail -s "mysqlBind$(RELEASE) `uname -n -s`" support at openisp.net < /dev/null > /dev/null 2>&1
#Note use -lmsql if so defined in local.h
#-lmsql
================================================================
Index: SOURCES/mysqlBind-paths.patch
diff -u SOURCES/mysqlBind-paths.patch:1.3 SOURCES/mysqlBind-paths.patch:1.4
--- SOURCES/mysqlBind-paths.patch:1.3 Mon Mar 1 14:53:00 2004
+++ SOURCES/mysqlBind-paths.patch Fri Sep 29 10:57:39 2006
@@ -1,113 +1,3 @@
-diff -ruN mysqlBind.orig/mainfunc.h mysqlBind/mainfunc.h
---- mysqlBind.orig/mainfunc.h 2004-02-04 22:50:46.000000000 +0100
-+++ mysqlBind/mainfunc.h 2004-03-01 13:36:38.000000000 +0100
-@@ -9,6 +9,7 @@
-
- */
-
-+#include "local.h"
-
- static char cTableList[32][32]=\
- {"tZone","tResource","tRRType","tJob","tNameServer","tMailServer","tClient","tAuthorize","tConfiguration",""};
-@@ -220,7 +221,7 @@
- {
- Header_ism3("NamedConf()",0);
- printf("</center><pre><blockquote>");
-- PassDirectHtml("/usr/local/mysqlbind/named.conf");
-+ PassDirectHtml(NAMED_CONF "/named.conf");
- printf("</blockquote></pre>");
- Footer_ism3();
- }//void NamedConf(void)
-@@ -263,12 +264,8 @@
- strncpy(cISMROOT,getenv("ISMROOT"),255);
- cHost[255]=0;
- }
--
-- if(!cISMROOT[0])
-- {
-- printf("You must set ISMROOT env var first. Ex. (csh) setenv ISMROOT /home/ism-3.0\n");
-- exit(1);
-- }
-+ else
-+ sprintf(cISMROOT,LIBDIR);
-
- printf("Restoring mysqlBind data from .txt file in %s/{{cProject}}/data...\n\n",cISMROOT);
-
-@@ -309,12 +306,8 @@
- strncpy(cISMROOT,getenv("ISMROOT"),255);
- cHost[255]=0;
- }
--
-- if(!cISMROOT[0])
-- {
-- printf("You must set ISMROOT env var first. Ex. (csh) setenv ISMROOT /home/ism-3.0\n");
-- exit(1);
-- }
-+ else
-+ sprintf(cISMROOT,LIBDIR);
-
- printf("Restoring mysqlBind data from .txt file in %s/{{cProject}}/data...\n\n",cISMROOT);
-
-@@ -351,12 +344,8 @@
- strncpy(cISMROOT,getenv("ISMROOT"),255);
- cHost[255]=0;
- }
--
-- if(!cISMROOT[0])
-- {
-- printf("You must set ISMROOT env var first. Ex. (csh) setenv ISMROOT /home/ism-3.0\n");
-- exit(1);
-- }
-+ else
-+ sprintf(cISMROOT,LIBDIR);
-
- printf("Backing up mysqlBind data to .txt files in \
- %s/mysqlBind/data...\n\n",cISMROOT);
-@@ -407,24 +396,8 @@
- strncpy(cISMROOT,getenv("ISMROOT"),255);
- cISMROOT[255]=0;
- }
--
-- if(!cISMROOT[0])
-- {
-- printf("You must set ISMROOT env var first. Ex. (csh) setenv ISMROOT /home/joe\n");
-- exit(1);
-- }
--
-- if(getenv("CGIDIR")!=NULL)
-- {
-- strncpy(cCGIDIR,getenv("CGIDIR"),255);
-- cCGIDIR[255]=0;
-- }
--
-- if(!cCGIDIR[0])
-- {
-- printf("You must set CGIDIR env var first. Ex. (csh) setenv CGIDIR /admin/cgi-bin/ (Note the trailing /)\n");
-- exit(1);
-- }
-+ else
-+ sprintf(cISMROOT,LIBDIR);
-
- printf("Creating db and setting permissions, installing data from %s/mysqlBind...\n\n",cISMROOT);
-
-@@ -530,9 +503,6 @@
- }
- }
-
-- sprintf(query,"cp $ISMROOT/mysqlBind/docs/tutorial.html $CGIDIR/mysqlbind.tutorial.txt");
-- system(query);
--
- printf("Done\n");
- exit(0);
-
-@@ -542,6 +512,7 @@
- void mySQLRootConnect(char *cPasswd)
- {
- mysql_init(&mysql);
-+ if (!mysql_real_connect(&mysql,NULL,"mysql",cPasswd,"mysql",0,NULL,0))
- if (!mysql_real_connect(&mysql,NULL,"root",cPasswd,"mysql",0,NULL,0))
- {
- printf("Database server unavailable\n");
diff -ruN mysqlBind.orig/bind.c mysqlBind/bind.c
--- mysqlBind.orig/bind.c 2003-12-22 17:27:39.000000000 +0100
+++ mysqlBind/bind.c 2004-03-01 13:54:00.000000000 +0100
@@ -240,3 +130,120 @@
if(system(query))
{
CreateMasterFiles(cMasterNS,"",1,1);
+--- ./mainfunc.h.org 2006-09-29 08:42:31.000000000 +0000
++++ ./mainfunc.h 2006-09-29 08:50:09.000000000 +0000
+@@ -13,6 +13,8 @@
+ ConnectDb?
+ */
+
++#include "local.h"
++
+
+ static char cTableList[32][32]=\
+ {"tZone","tResource","tRRType","tJob","tNameServer","tMailServer","tClient","tAuthorize","tConfiguration",""};
+@@ -320,7 +322,7 @@
+ {
+ Header_ism3("NamedConf()",0);
+ printf("</center><pre><blockquote>");
+- PassDirectHtml("/usr/local/mysqlbind/named.conf");
++ PassDirectHtml(NAMED_CONF "/named.conf");
+ printf("</blockquote></pre>");
+ Footer_ism3();
+ }//void NamedConf(void)
+@@ -361,12 +363,8 @@
+ strncpy(cISMROOT,getenv("ISMROOT"),255);
+ cHost[255]=0;
+ }
+-
+- if(!cISMROOT[0])
+- {
+- printf("You must set ISMROOT env var first. Ex. (bash) export ISMROOT=/home/ism-3.0\n");
+- exit(1);
+- }
++ else
++ sprintf(cISMROOT,LIBDIR);
+
+ printf("Restoring mysqlBind data from .txt file in %s/{{cProject}}/data...\n\n",cISMROOT);
+
+@@ -407,12 +405,8 @@
+ strncpy(cISMROOT,getenv("ISMROOT"),255);
+ cHost[255]=0;
+ }
+-
+- if(!cISMROOT[0])
+- {
+- printf("You must set ISMROOT env var first. Ex. (bash) export ISMROOT=/home/ism-3.0\n");
+- exit(1);
+- }
++ else
++ sprintf(cISMROOT,LIBDIR);
+
+ printf("Restoring mysqlBind data from .txt file in %s/{{cProject}}/data...\n\n",cISMROOT);
+
+@@ -449,12 +443,8 @@
+ strncpy(cISMROOT,getenv("ISMROOT"),255);
+ cHost[255]=0;
+ }
+-
+- if(!cISMROOT[0])
+- {
+- printf("You must set ISMROOT env var first. Ex. (bash) export ISMROOT=/home/ism-3.0\n");
+- exit(1);
+- }
++ else
++ sprintf(cISMROOT,LIBDIR);
+
+ printf("Backing up mysqlBind data to .txt files in \
+ %s/mysqlBind/data...\n\n",cISMROOT);
+@@ -505,24 +495,8 @@
+ strncpy(cISMROOT,getenv("ISMROOT"),255);
+ cISMROOT[255]=0;
+ }
+-
+- if(!cISMROOT[0])
+- {
+- printf("You must set ISMROOT env var first. Ex. (bash) export ISMROOT=/home/joe\n");
+- exit(1);
+- }
+-
+- if(getenv("CGIDIR")!=NULL)
+- {
+- strncpy(cCGIDIR,getenv("CGIDIR"),255);
+- cCGIDIR[255]=0;
+- }
+-
+- if(!cCGIDIR[0])
+- {
+- printf("You must set CGIDIR env var first. Ex. (bash) export CGIDIR=/admin/cgi-bin/ (Note the trailing /)\n");
+- exit(1);
+- }
++ else
++ sprintf(cISMROOT,LIBDIR);
+
+ printf("Creating db and setting permissions, installing data from %s/mysqlBind...\n\n",cISMROOT);
+
+@@ -600,9 +574,6 @@
+ }
+ }
+
+- sprintf(query,"cp $ISMROOT/mysqlBind/docs/tutorial.html $CGIDIR/mysqlbind.tutorial.txt");
+- system(query);
+-
+ printf("Done\n");
+ exit(0);
+
+@@ -630,9 +601,12 @@
+
+ mysql_init(&mysql);
+ #ifdef USECONF
+- if(!mysql_real_connect(&mysql,gcEffectiveDbIp,"root",cPasswd,
+- "mysql",guDbPort,gcEffectiveDbSocket,0))
++ if (!mysql_real_connect(&mysql,gcEffectiveDbIp,"mysql",cPasswd,
++ "mysql",guDbPort,gcEffectiveDbSocket,0))
++ if (!mysql_real_connect(&mysql,gcEffectiveDbIp,"root",cPasswd,
++ "mysql",guDbPort,gcEffectiveDbSocket,0))
+ #else
++ if (!mysql_real_connect(&mysql,DBIP,"mysql",cPasswd,"mysql",DBPORT,DBSOCKET,0))
+ if (!mysql_real_connect(&mysql,DBIP,"root",cPasswd,"mysql",DBPORT,DBSOCKET,0))
+ #endif
+ {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/mysqlBind-makefile.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/mysqlBind-paths.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list