rpms/openldap/devel MigrationTools-46-ddp.patch, NONE, 1.1 openldap.spec, 1.68, 1.69

[Jan Šafránek (jsafrane)]

Author: jsafrane

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

Modified Files:
	openldap.spec 
Added Files:
	MigrationTools-46-ddp.patch 
Log Message:
- do not import ddp services with migrate_services.pl
- minor cleanup of prev. bugfix
Resolves: #201183

MigrationTools-46-ddp.patch:

--- NEW FILE MigrationTools-46-ddp.patch ---
--- MigrationTools-46/migrate_services.pl.orig	2007-05-23 14:41:22.000000000 +0200
+++ MigrationTools-46/migrate_services.pl	2007-05-23 14:42:55.000000000 +0200
@@ -102,6 +102,12 @@
 		my ($servicename, $portproto, @aliases) = split(m/\s+/o, $card);
 		my ($rawport, $proto) = split(m#[/,]#o, $portproto);
 
+		# do not generate ddp services - it's AppleTalk, not IP
+                if ($proto eq "ddp") { 
+                    print STDERR "Skipping non-IP service '$servicename $portproto'\n";
+                    next; 
+                }
+
 		# Find services specifying a port range (e.g. X11.)
 		my $loport = '';
 		my $hiport = '';


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- openldap.spec	22 May 2007 15:48:20 -0000	1.68
+++ openldap.spec	23 May 2007 13:09:09 -0000	1.69
@@ -59,6 +59,7 @@
 Patch303: MigrationTools-26-suffix.patch
 Patch304: MigrationTools-46-schema.patch
 Patch305: MigrationTools-45-noaliases.patch
+Patch306: MigrationTools-46-ddp.patch
 
 Patch400: db-4.4.20-1.patch
 Patch401: db-4.4.20-2.patch
@@ -200,6 +201,7 @@
 %patch303 -p1 -b .suffix
 %patch304 -p1 -b .schema
 %patch305 -p1 -b .noaliases
+%patch306 -p1 -b .ddp
 popd
 
 autodir=`pwd`/auto-instroot
@@ -422,6 +424,7 @@
 pushd openldap-%{compat_version}/build-compat/servers/slapd
         make install-tools DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool"
 	mv $RPM_BUILD_ROOT/%{_sbindir}/slapcat $RPM_BUILD_ROOT/%{_sbindir}/compat-slapcat
+	rm $RPM_BUILD_ROOT/%{_sbindir}/sl*
 popd
 
 # Install servers.
@@ -727,6 +730,8 @@
 * Tue May 22 2007 Jan Safranek <jsafranek at redhat.com>
 - do not create script in /tmp on startup (bz#188298)
 - add compat-slapcat to openldap-compat (bz#179378)
+- do not import ddp services with migrate_services.pl
+  (bz#201183)
 
 * Mon Apr 23 2007 Jan Safranek <jsafranek at redhat.com> 2.3.34-2%{?dist}
 - slapadd during package update is now quiet (bz#224581)