rpms/bind/devel bind-9.3.1rc1-sdb_tools-Makefile.in, 1.3, 1.4 bind-9.3.2b1-fix_sdb_ldap.patch, 1.2, 1.3 bind-9.4.1-ldap-api.patch, 1.3, 1.4 bind-9.5-sdb-sqlite-bld.patch, 1.1, 1.2 bind.spec, 1.247, 1.248

Adam Tkac (atkac) fedora-extras-commits at redhat.com
Tue Feb 12 11:40:55 UTC 2008


Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20781

Modified Files:
	bind-9.3.1rc1-sdb_tools-Makefile.in 
	bind-9.3.2b1-fix_sdb_ldap.patch bind-9.4.1-ldap-api.patch 
	bind-9.5-sdb-sqlite-bld.patch bind.spec 
Log Message:
- improved sdb_tools Makefile.in



Index: bind-9.3.1rc1-sdb_tools-Makefile.in
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.3.1rc1-sdb_tools-Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bind-9.3.1rc1-sdb_tools-Makefile.in	15 Sep 2006 14:45:20 -0000	1.3
+++ bind-9.3.1rc1-sdb_tools-Makefile.in	12 Feb 2008 11:40:19 -0000	1.4
@@ -32,27 +32,21 @@
 
 TARGETS =	zone2ldap at EXEEXT@ zonetodb at EXEEXT@
 
-OBJS	=	zone2ldap.o zonetodb.o
+OBJS	=	zone2ldap. at O@ zonetodb. at O@
 
 SRCS    =       zone2ldap.c zonetodb.c
 
 MANPAGES =      zone2ldap.1
 
-EXT_CFLAGS =    -fPIE
+EXT_CFLAGS =
 
 @BIND9_MAKE_RULES@
 
-LDFLAGS   +=    -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack
+zone2ldap at EXEEXT@: zone2ldap. at O@ ${DEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone2ldap. at O@ -lldap -llber ${LIBS}
 
-LIBTOOL_MODE_COMPILE=
-
-.SUFFIXES: .c .o
-
-zone2ldap:	zone2ldap.o ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone2ldap.o -lldap -llber ${LIBS}
-
-zonetodb:	zonetodb.o  ${DEPLIBS}
-	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.o -lpq ${LIBS}
+zonetodb at EXEEXT@: zonetodb. at O@  ${DEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb. at O@ -lpq ${LIBS}
 
 clean distclean manclean maintainer-clean::
 	rm -f ${TARGETS} ${OBJS}
@@ -62,6 +56,6 @@
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
 
 install:: ${TARGETS} installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap ${DESTDIR}${sbindir}
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb  ${DESTDIR}${sbindir}
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap at EXEEXT@ ${DESTDIR}${sbindir}
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb at EXEEXT@  ${DESTDIR}${sbindir}
 	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1

bind-9.3.2b1-fix_sdb_ldap.patch:

Index: bind-9.3.2b1-fix_sdb_ldap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.3.2b1-fix_sdb_ldap.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bind-9.3.2b1-fix_sdb_ldap.patch	24 Jul 2007 15:18:00 -0000	1.2
+++ bind-9.3.2b1-fix_sdb_ldap.patch	12 Feb 2008 11:40:19 -0000	1.3
@@ -7,8 +7,8 @@
 -TARGETS =	zone2ldap at EXEEXT@ zonetodb at EXEEXT@
 +TARGETS =	zone2ldap at EXEEXT@ ldap2zone at EXEEXT@ zonetodb at EXEEXT@
  
--OBJS	=	zone2ldap.o zonetodb.o
-+OBJS	=	zone2ldap.o ldap2zone.o zonetodb.o
+-OBJS	=	zone2ldap. at O@ zonetodb. at O@
++OBJS	=	zone2ldap. at O@ ldap2zone. at O@ zonetodb. at O@
  
 -SRCS    =       zone2ldap.c zonetodb.c
 +SRCS    =       zone2ldap.c ldap2zone.c zonetodb.c
@@ -16,11 +16,11 @@
  MANPAGES =      zone2ldap.1
  
 @@ -54,6 +54,9 @@
- zonetodb:	zonetodb.o  ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.o -lpq ${LIBS}
+ zonetodb at EXEEXT@:	zonetodb. at O@  ${DEPLIBS}
+ 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zonetodb. at O@ -lpq ${LIBS}
  
-+ldap2zone:	ldap2zone.o ${DEPLIBS}
-+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ldap2zone.o -lldap -llber ${LIBS}
++ldap2zone at EXEEXT@:	ldap2zone. at O@ ${DEPLIBS}
++	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ldap2zone. at O@ -lldap -llber ${LIBS}
 +
  clean distclean manclean maintainer-clean::
  	rm -f ${TARGETS} ${OBJS}
@@ -28,9 +28,9 @@
 @@ -63,5 +66,6 @@
  
  install:: ${TARGETS} installdirs
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap ${DESTDIR}${sbindir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone ${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb  ${DESTDIR}${sbindir}
+ 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap at EXEEXT@ ${DESTDIR}${sbindir}
++	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone at EXEEXT@ ${DESTDIR}${sbindir}
+ 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb at EXEEXT@  ${DESTDIR}${sbindir}
  	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1
 --- bind-9.3.2b1/bin/sdb_tools/zone2ldap.c.fix_sdb_ldap	2005-10-06 18:57:32.000000000 -0400
 +++ bind-9.3.2b1/bin/sdb_tools/zone2ldap.c	2005-10-06 18:57:32.000000000 -0400

bind-9.4.1-ldap-api.patch:

Index: bind-9.4.1-ldap-api.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.4.1-ldap-api.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bind-9.4.1-ldap-api.patch	11 Feb 2008 17:11:26 -0000	1.3
+++ bind-9.4.1-ldap-api.patch	12 Feb 2008 11:40:19 -0000	1.4
@@ -16,8 +16,8 @@
  
  MANPAGES =      zone2ldap.1
  
--EXT_CFLAGS =    -fPIE
-+EXT_CFLAGS =    -fPIE -DLDAP_DEPRECATED
+-EXT_CFLAGS =
++EXT_CFLAGS = -DLDAP_DEPRECATED
  
  @BIND9_MAKE_RULES@
  

bind-9.5-sdb-sqlite-bld.patch:

Index: bind-9.5-sdb-sqlite-bld.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind-9.5-sdb-sqlite-bld.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bind-9.5-sdb-sqlite-bld.patch	11 Feb 2008 17:11:26 -0000	1.1
+++ bind-9.5-sdb-sqlite-bld.patch	12 Feb 2008 11:40:19 -0000	1.2
@@ -76,8 +76,8 @@
 -TARGETS =	zone2ldap at EXEEXT@ ldap2zone at EXEEXT@ zonetodb at EXEEXT@
 +TARGETS =	zone2ldap at EXEEXT@ ldap2zone at EXEEXT@ zonetodb at EXEEXT@ zone2sqlite at EXEEXT@
  
--OBJS	=	zone2ldap.o ldap2zone.o zonetodb.o
-+OBJS	=	zone2ldap.o ldap2zone.o zonetodb.o zone2sqlite
+-OBJS	=	zone2ldap. at O@ ldap2zone. at O@ zonetodb. at O@
++OBJS	=	zone2ldap. at O@ ldap2zone. at O@ zonetodb. at O@ zone2sqlite. at O@
  
 -SRCS    =       zone2ldap.c ldap2zone.c zonetodb.c
 +SRCS    =       zone2ldap.c ldap2zone.c zonetodb.c zone2sqlite.c
@@ -85,18 +85,18 @@
  MANPAGES =      zone2ldap.1
  
 @@ -54,6 +54,9 @@ zone2ldap:	zone2ldap.o ${DEPLIBS}
- zonetodb:	zonetodb.o  ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zonetodb.o -lpq ${LIBS}
+ zonetodb at EXEEXT@:	zonetodb. at O@  ${DEPLIBS}
+ 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zonetodb. at O@ -lpq ${LIBS}
  
-+zone2sqlite:	zone2sqlite.o  ${DEPLIBS}
-+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone2sqlite.o -lsqlite3 -lssl ${LIBS}
++zone2sqlite at EXEEXT@:	zone2sqlite. at O@  ${DEPLIBS}
++	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ zone2sqlite. at O@ -lsqlite3 -lssl ${LIBS}
 +
- ldap2zone:	ldap2zone.o ${DEPLIBS}
- 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ldap2zone.o -lldap -llber ${LIBS}
+ ldap2zone at EXEEXT@:	ldap2zone. at O@ ${DEPLIBS}
+ 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ldap2zone. at O@ -lldap -llber ${LIBS}
  
 @@ -68,4 +71,5 @@ install:: ${TARGETS} installdirs
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap ${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone ${DESTDIR}${sbindir}
- 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb  ${DESTDIR}${sbindir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite  ${DESTDIR}${sbindir}
+ 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2ldap at EXEEXT@ ${DESTDIR}${sbindir}
+ 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ldap2zone at EXEEXT@ ${DESTDIR}${sbindir}
+ 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zonetodb at EXEEXT@  ${DESTDIR}${sbindir}
++	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} zone2sqlite at EXEEXT@  ${DESTDIR}${sbindir}
  	${INSTALL_DATA} ${srcdir}/zone2ldap.1 ${DESTDIR}${mandir}/man1/zone2ldap.1


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- bind.spec	11 Feb 2008 17:11:26 -0000	1.247
+++ bind.spec	12 Feb 2008 11:40:19 -0000	1.248
@@ -670,6 +670,7 @@
   - removed bind-9.5-gssapi-header.patch (upstream)
   - removed bind-9.5-CVE-2008-0122.patch (upstream)
 - removed bind-9.2.2-nsl.patch
+- improved sdb_tools Makefile.in
 
 * Mon Feb 04 2008 Adam Tkac <atkac redhat com> 32:9.5.0-25.b1
 - fixed segfault during sending notifies (#400461)




More information about the fedora-extras-commits mailing list