Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/common/IO-Socket-SSL b/config/rootfiles/common/IO-Socket-SSL
index 09b9f31987c31d1a21b53f2b6bf525cd8d92d86e..94c47680b3c74830221d5ac83bf63e4f58416ad8 100644 (file)
--- a/config/rootfiles/common/IO-Socket-SSL
+++ b/config/rootfiles/common/IO-Socket-SSL
@@ -1,6 +1,6 @@
 usr/lib/perl5/site_perl/5.12.3/IO/Socket
 usr/lib/perl5/site_perl/5.12.3/IO/Socket/SSL.pm
-usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/IO/Socket
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/IO/Socket/SSL
-#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/IO/Socket/SSL/.packlist
+usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/IO/Socket
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/IO/Socket/SSL
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/IO/Socket/SSL/.packlist
 #usr/share/man/man3/IO::Socket::SSL.3