diff --git a/MigrationTools-46-ddp.patch b/MigrationTools-46-ddp.patch new file mode 100644 index 0000000..8e0a54b --- /dev/null +++ b/MigrationTools-46-ddp.patch @@ -0,0 +1,15 @@ +--- 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 = ''; diff --git a/openldap.spec b/openldap.spec index baa6796..cdbb469 100644 --- a/openldap.spec +++ b/openldap.spec @@ -59,6 +59,7 @@ Patch302: MigrationTools-27-simple.patch 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 @@ pushd MigrationTools-%{migtools_version} %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 @@ popd 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 @@ fi * Tue May 22 2007 Jan Safranek - 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 2.3.34-2%{?dist} - slapadd during package update is now quiet (bz#224581)