Merge branch 'master' of github.com:pisilinux/main

This commit is contained in:
Ertuğrul Erata
2016-03-27 14:52:40 +03:00
14 changed files with 576 additions and 78 deletions
+68 -20
View File
@@ -4944,7 +4944,7 @@
<Description xml:lang="en">Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.</Description>
<Description xml:lang="tr">Mesa, OpenGL belirtiminin (etkileşimli 3B grafiklerin gerçeklenmesi için bir sistem) açık kaynaklı bir uyarlamasıdır.</Description>
<Description xml:lang="pl">Mesa jest open-source&apos;ową implementacją specyfikacji OpenGL do renderowania trójwymiarowej grafiki.</Description>
<Archive type="targz" sha1sum="0983b699538d4f096dbee78887ca4575c878e10a">ftp://ftp.freedesktop.org/pub/mesa/older-versions/10.x/10.5.5/mesa-10.5.5.tar.gz</Archive>
<Archive type="targz" sha1sum="a9600ccb8350ef490f1d3c3fa9d93bcb347b87b7">ftp://ftp.freedesktop.org/pub/mesa/11.1.2/mesa-11.1.2.tar.gz</Archive>
<BuildDependencies>
<Dependency>llvm</Dependency>
<Dependency>llvm-libs</Dependency>
@@ -5085,8 +5085,8 @@
</Package>
<History>
<Update release="1">
<Date>2016-01-10</Date>
<Version>10.5.5</Version>
<Date>2016-03-27</Date>
<Version>11.1.2</Version>
<Comment>First release</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
@@ -10798,7 +10798,7 @@
<Summary xml:lang="tr">LDAP uygulamaları ve geliştirme araçları</Summary>
<Description xml:lang="en">OpenLDAP is an open-source suite of LDAP (Lightweight Directory Access Protocol) applications and development tools</Description>
<Description xml:lang="tr">LDAP hizmeti için gereken uygulamalar ve geliştirme araçlarını içerir</Description>
<Archive type="targz" sha1sum="c6880df9fec928a5f010b78a4285b497e8a12d6b">ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.41.tgz</Archive>
<Archive type="targz" sha1sum="016a738d050a68d388602a74b5e991035cdba149">ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.44.tgz</Archive>
<BuildDependencies>
<Dependency>nss-devel</Dependency>
<Dependency>db-devel</Dependency>
@@ -10806,11 +10806,13 @@
<Dependency>tcp-wrappers-devel</Dependency>
<Dependency>cyrus-sasl-devel</Dependency>
<Dependency>libtool-ltdl</Dependency>
<Dependency>icu4c-devel</Dependency>
<Dependency>libutil-linux-devel</Dependency>
<Dependency>e2fsprogs-devel</Dependency>
<Dependency>groff</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">openldap-2.4.39-blfs_paths-1.patch</Patch>
<Patch level="1">openldap-2.4.39-symbol_versions-1.patch</Patch>
<Patch level="1">openldap-2.4.44-consolidated-2.patch</Patch>
<Patch level="1">openldap-2.4.39-ntlm-1.patch</Patch>
<Patch level="1">fedora/openldap-sql-linking.patch</Patch>
<Patch level="1">fedora/openldap-reentrant-gethostby.patch</Patch>
@@ -10907,8 +10909,8 @@
</Package>
<History>
<Update release="1">
<Date>2015-07-01</Date>
<Version>2.4.41</Version>
<Date>2016-03-27</Date>
<Version>2.4.44</Version>
<Comment>First release</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
@@ -42553,10 +42555,11 @@
<Description xml:lang="fr">Les fontes DejaVu basées sur des fontes Bitstream avec des améliorations.</Description>
<Description xml:lang="en">Contains DejaVu fonts that are based on Bitstream fonts, with improvements.</Description>
<Description xml:lang="nl">Bevat de DejaVu fonts die zijn gebasserd op de Bitstream fonts, met verbeteringen.</Description>
<Archive type="tarbz2" sha1sum="27e428fc723934c050cfcfc86d1b1ff2273d146e">mirrors://sourceforge/dejavu/dejavu-fonts-2.34.tar.bz2</Archive>
<Archive type="tarbz2" sha1sum="27e428fc723934c050cfcfc86d1b1ff2273d146e">mirrors://sourceforge/dejavu/2.34/dejavu-fonts-2.34.tar.bz2</Archive>
<BuildDependencies>
<Dependency>fontforge</Dependency>
<Dependency>perl-Font-TTF</Dependency>
<Dependency>perl-IO-String</Dependency>
<Dependency>unicode-ucd</Dependency>
</BuildDependencies>
<SourceURI>desktop/font/dejavu-fonts/pspec.xml</SourceURI>
@@ -77521,7 +77524,7 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
<PartOf>programming.misc</PartOf>
<Summary xml:lang="en">ODBC Interface for Linux</Summary>
<Description xml:lang="en">The unixODBC Project goals are to develop and promote unixODBC to be the definitive standard for ODBC on non MS Windows platforms.</Description>
<Archive type="targz" sha1sum="f84520fd58143625b614fde551435178a558ee2e">http://www.unixodbc.org/unixODBC-2.3.2.tar.gz</Archive>
<Archive type="targz" sha1sum="df3578b080fb67da544d4c83424a770729ef25fb">ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.4.tar.gz</Archive>
<BuildDependencies>
<Dependency>libtool-ltdl</Dependency>
</BuildDependencies>
@@ -77564,8 +77567,8 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
</Package>
<History>
<Update release="1">
<Date>2014-05-19</Date>
<Version>2.3.2</Version>
<Date>2016-03-27</Date>
<Version>2.3.4</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
@@ -79773,6 +79776,47 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>perl-Test-Deep</Name>
<Homepage>http://search.cpan.org/dist/Test-Deep/</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admin@pisilinux.org</Email>
</Packager>
<License>as-is</License>
<IsA>library</IsA>
<PartOf>programming.language.perl</PartOf>
<Summary xml:lang="en">A Perl module that gives you lots of flexibility when testing deep structures</Summary>
<Summary xml:lang="tr">Derin yapıları test ederken çok fazla esneklik sağlayan bir Perl modülü</Summary>
<Description xml:lang="en">perl-Test-Deep is a Perl module that gives you lots of flexibility when testing deep structures.</Description>
<Description xml:lang="tr">perl-Test-Deep derin yapıları test ederken çok fazla esneklik sağlayan bir Perl modülüdür.</Description>
<Archive type="targz" sha1sum="31860fabf33520dedee66147e5962577df1ea511">http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Test-Deep-1.120.tar.gz</Archive>
<BuildDependencies>
<Dependency>perl</Dependency>
</BuildDependencies>
<SourceURI>programming/language/perl/perl-Test-Deep/pspec.xml</SourceURI>
</Source>
<Package>
<Name>perl-Test-Deep</Name>
<RuntimeDependencies>
<Dependency>perl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2016-03-27</Date>
<Version>1.120</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>perl-HTML-Parser</Name>
@@ -80678,7 +80722,7 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
<Summary xml:lang="tr">Basit bir HTTP Sunucusu</Summary>
<Description xml:lang="en">HTTP::Server::Simple is a very simple standalone HTTP daemon with no non-core module dependencies. It&apos;s ideal for building a standalone http-based UI to your existing tools.</Description>
<Description xml:lang="tr">HTTP::Server::Simple basit, perl çekirdek modülleri dışında bağımlılığı olmadan tek başına çalışabilen bir HTTP hizmetidir. Tek başına çalışan, HTTP temelli bir uygulama yazmak istiyorsanız idealdir.</Description>
<Archive type="targz" sha1sum="ca85f22aae7b337af066a034890a013ffb55b02b">http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/HTTP-Server-Simple-0.45_02.tar.gz</Archive>
<Archive type="targz" sha1sum="251a3f9c8405ffb7aeb2b3f8c7fb5271c53dbcae">http://search.cpan.org/CPAN/authors/id/B/BP/BPS/HTTP-Server-Simple-0.51.tar.gz</Archive>
<BuildDependencies>
<Dependency>perl</Dependency>
<Dependency>perl-URI</Dependency>
@@ -80699,11 +80743,11 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
</Package>
<History>
<Update release="1">
<Date>2014-09-10</Date>
<Version>0.45_02</Version>
<Date>2016-03-27</Date>
<Version>0.51</Version>
<Comment>First release</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
<Name>Alihan Öztürk</Name>
<Email>alhan@pisilinux.org</Email>
</Update>
</History>
</SpecFile>
@@ -80742,7 +80786,7 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
</Package>
<History>
<Update release="1">
<Date>2016-03-17</Date>
<Date>2016-03-27</Date>
<Version>1.05</Version>
<Comment>First release</Comment>
<Name>Ayhan Yalçınsoy</Name>
@@ -81262,6 +81306,7 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
<Dependency>perl-HTTP-Date</Dependency>
<Dependency>perl-HTML-Parser</Dependency>
<Dependency>perl-HTML-Tagset</Dependency>
<Dependency>perl-HTTP-Cookies</Dependency>
<Dependency>perl-HTTP-Daemon</Dependency>
<Dependency>perl-File-Listing</Dependency>
<Dependency>perl-HTTP-Message</Dependency>
@@ -81269,6 +81314,7 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
<Dependency>perl-HTTP-Negotiate</Dependency>
<Dependency>perl-LWP-Mediatypes</Dependency>
<Dependency>perl-WWW-Robotrules</Dependency>
<Dependency>perl-LWP-Protocol-https</Dependency>
</BuildDependencies>
<SourceURI>programming/language/perl/perl-libwww/pspec.xml</SourceURI>
</Source>
@@ -81288,6 +81334,8 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
<Dependency>perl-HTTP-Negotiate</Dependency>
<Dependency>perl-LWP-Mediatypes</Dependency>
<Dependency>perl-WWW-Robotrules</Dependency>
<Dependency>perl-LWP-Protocol-https</Dependency>
<Dependency>perl-HTTP-Cookies</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -81299,7 +81347,7 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
</Package>
<History>
<Update release="1">
<Date>2016-03-26</Date>
<Date>2016-03-27</Date>
<Version>6.15</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
@@ -84993,7 +85041,7 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
</Package>
<History>
<Update release="1">
<Date>2014-09-23</Date>
<Date>2014-09-27</Date>
<Version>3.5.0</Version>
<Comment>First release</Comment>
<Name>Serdar Soytetir</Name>
+1 -1
View File
@@ -1 +1 @@
1b2ef71c51ec4da6277dfc633c0e1dc8f86282df
2be8bd15c02029bc49a53bff83979ea9a1132faf
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
99d8ed3751bcb812917233fb02e6dc669ab38233
c8c4761eb3d036ad0cf0a6bf9ff2ff02e752bbc6
@@ -16,8 +16,8 @@ def setup():
def build():
perlmodules.make()
def check():
perlmodules.make("test")
#def check():
#perlmodules.make("test")
def install():
perlmodules.install()
@@ -13,7 +13,7 @@
<IsA>library</IsA>
<Summary>Lightweight HTTP Server</Summary>
<Description>HTTP::Server::Simple is a very simple standalone HTTP daemon with no non-core module dependencies. It's ideal for building a standalone http-based UI to your existing tools.</Description>
<Archive sha1sum="ca85f22aae7b337af066a034890a013ffb55b02b" type="targz">http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/HTTP-Server-Simple-0.45_02.tar.gz</Archive>
<Archive sha1sum="251a3f9c8405ffb7aeb2b3f8c7fb5271c53dbcae" type="targz">http://search.cpan.org/CPAN/authors/id/B/BP/BPS/HTTP-Server-Simple-0.51.tar.gz</Archive>
<BuildDependencies>
<Dependency>perl</Dependency>
<Dependency>perl-URI</Dependency>
@@ -35,11 +35,11 @@
<History>
<Update release="1">
<Date>2014-09-10</Date>
<Version>0.45_02</Version>
<Date>2016-03-27</Date>
<Version>0.51</Version>
<Comment>First release</Comment>
<Name>Marcin Bojara</Name>
<Email>marcin@pisilinux.org</Email>
<Name>Alihan Öztürk</Name>
<Email>alhan@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -1,39 +1,39 @@
--- Makefile.PL.old 2016-01-04 11:31:52.349484123 +0800
+++ Makefile.PL 2016-01-04 11:32:07.432992090 +0800
@@ -15,7 +15,6 @@
'LWP::UserAgent' => '6.06',
'Net::HTTPS' => 6,
'IO::Socket::SSL' => "1.54",
- 'Mozilla::CA' => "20110101",
},
META_MERGE => {
resources => {
--- lib/LWP/Protocol/https.pm.old 2016-01-04 11:33:19.003810886 +0800
+++ lib/LWP/Protocol/https.pm 2016-01-04 11:34:42.358079461 +0800
@@ -25,25 +25,7 @@
}
if ($ssl_opts{SSL_verify_mode}) {
unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
- eval {
- require Mozilla::CA;
- };
- if ($@) {
- if ($@ =! /^Can't locate Mozilla\/CA\.pm/) {
- $@ = <<'EOT';
-Can't verify SSL peers without knowing which Certificate Authorities to trust
-
-This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE
-environment variable or by installing the Mozilla::CA module.
-
-To disable verification of SSL peers set the PERL_LWP_SSL_VERIFY_HOSTNAME
-environment variable to 0. If you do this you can't be sure that you
-communicate with the expected peer.
-EOT
- }
- die $@;
- }
- $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
+ $ssl_opts{SSL_ca_file} = '/etc/ssl/certs/ca-certificates.crt';
}
}
$self->{ssl_opts} = \%ssl_opts;
+--- Makefile.PL.old 2016-01-04 11:31:52.349484123 +0800
++++ Makefile.PL 2016-01-04 11:32:07.432992090 +0800
+@@ -15,7 +15,6 @@
+ 'LWP::UserAgent' => '6.06',
+ 'Net::HTTPS' => 6,
+ 'IO::Socket::SSL' => "1.54",
+- 'Mozilla::CA' => "20110101",
+ },
+ META_MERGE => {
+ resources => {
+--- lib/LWP/Protocol/https.pm.old 2016-01-04 11:33:19.003810886 +0800
++++ lib/LWP/Protocol/https.pm 2016-01-04 11:34:42.358079461 +0800
+@@ -25,25 +25,7 @@
+ }
+ if ($ssl_opts{SSL_verify_mode}) {
+ unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
+- eval {
+- require Mozilla::CA;
+- };
+- if ($@) {
+- if ($@ =! /^Can't locate Mozilla\/CA\.pm/) {
+- $@ = <<'EOT';
+-Can't verify SSL peers without knowing which Certificate Authorities to trust
+-
+-This problem can be fixed by either setting the PERL_LWP_SSL_CA_FILE
+-environment variable or by installing the Mozilla::CA module.
+-
+-To disable verification of SSL peers set the PERL_LWP_SSL_VERIFY_HOSTNAME
+-environment variable to 0. If you do this you can't be sure that you
+-communicate with the expected peer.
+-EOT
+- }
+- die $@;
+- }
+- $ssl_opts{SSL_ca_file} = Mozilla::CA::SSL_ca_file();
++ $ssl_opts{SSL_ca_file} = '/etc/ssl/certs/ca-certificates.crt';
+ }
+ }
+ $self->{ssl_opts} = \%ssl_opts;
@@ -0,0 +1,22 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import perlmodules
from pisi.actionsapi import get
WorkDir = "%s-%s" % (get.srcNAME()[5:], get.srcVERSION())
def setup():
perlmodules.configure()
def build():
perlmodules.make()
def check():
perlmodules.make("test")
def install():
perlmodules.install()
@@ -0,0 +1,41 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>perl-Test-Deep</Name>
<Homepage>http://search.cpan.org/dist/Test-Deep/</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admin@pisilinux.org</Email>
</Packager>
<License>as-is</License>
<IsA>library</IsA>
<Summary>A Perl module that gives you lots of flexibility when testing deep structures</Summary>
<Description>perl-Test-Deep is a Perl module that gives you lots of flexibility when testing deep structures.</Description>
<Archive sha1sum="31860fabf33520dedee66147e5962577df1ea511" type="targz">http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Test-Deep-1.120.tar.gz</Archive>
<BuildDependencies>
<Dependency>perl</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>perl-Test-Deep</Name>
<RuntimeDependencies>
<Dependency>perl</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2016-03-27</Date>
<Version>1.120</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</PISI>
@@ -0,0 +1,9 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>perl-Test-Deep</Name>
<Summary xml:lang="tr">Derin yapıları test ederken çok fazla esneklik sağlayan bir Perl modülü</Summary>
<Description xml:lang="tr">perl-Test-Deep derin yapıları test ederken çok fazla esneklik sağlayan bir Perl modülüdür.</Description>
</Source>
</PISI>
+4 -2
View File
@@ -23,8 +23,9 @@ def setup():
#pisitools.ldflags.add("-pie")
options = "--prefix=/usr \
--enable-bdb \
--enable-hdb=mod \
--disable-bdb \
--disable-hdb \
--enable-backends=mod \
--enable-slapd \
--enable-passwd=mod \
--enable-dnssrv=mod \
@@ -54,6 +55,7 @@ def setup():
--with-threads \
--with-cyrus-sasl \
--without-fetch \
--without-threads \
--enable-crypt \
--enable-ipv6 \
--enable-dynacl \
@@ -0,0 +1,371 @@
Submitted by: Bruce Dubbs <bdubbs at linuxfromscratch.org>
Date: 2012-03-26
Initial Package Version: 2.4.40
Upstream Status: BLFS Specific
Origin: Armin K. <krejzi at email dot com> and Debian
Comment: Rediffed by Fernando de Oliveira <famobr at yahoo dot
com dot br> for version 2.4.44 - 2016.02.06
Rediffed by Pierre Labastie <pierre dot labastie at
neuf dot fr> to add mdb backend and slapd.ldif. See
ticket #7394 - 2016.02.24
Description: Consolidate earlier patches to:
1. Update various installation options, such as ldap database path,
configuration file options, slapd install location, etc.
2. Remove reference to bdb module
3. Enables symbol versioning in ldap libraries. Without these changes
some applications might generate a warning about missing symbol versions.
diff -Naur openldap-2.4.40.orig/build/openldap.m4 openldap-2.4.40/build/openldap.m4
--- openldap-2.4.40.orig/build/openldap.m4 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/build/openldap.m4 2015-03-26 15:37:39.801077750 -0500
@@ -1142,3 +1142,54 @@
#endif
], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
])
+
+dnl ====================================================================
+dnl check for symbol versioning support
+AC_DEFUN([OL_SYMBOL_VERSIONING],
+[AC_CACHE_CHECK([for .symver assembler directive],
+ [ol_cv_asm_symver_directive],[
+cat > conftest.s <<EOF
+${libc_cv_dot_text}
+_sym:
+.symver _sym,sym@VERS
+EOF
+if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
+ ol_cv_asm_symver_directive=yes
+else
+ ol_cv_asm_symver_directive=no
+fi
+rm -f conftest*])
+AC_CACHE_CHECK([for ld --version-script],
+ [ol_cv_ld_version_script_option],[
+if test $ol_cv_asm_symver_directive = yes; then
+ cat > conftest.s <<EOF
+${libc_cv_dot_text}
+_sym:
+.symver _sym,sym@VERS
+EOF
+ cat > conftest.map <<EOF
+VERS_1 {
+ global: sym;
+};
+
+VERS_2 {
+ global: sym;
+} VERS_1;
+EOF
+ if ${CC-cc} -c $ASFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $LDFLAGS -shared
+ -o conftest.so conftest.o
+ -Wl,--version-script,conftest.map
+ 1>&AS_MESSAGE_LOG_FD]);
+ then
+ ol_cv_ld_version_script_option=yes
+ else
+ ol_cv_ld_version_script_option=no
+ fi
+ else
+ ol_cv_ld_version_script_option=no
+ fi
+else
+ ol_cv_ld_version_script_option=no
+fi
+rm -f conftest*])])
diff -Naur openldap-2.4.40.orig/build/top.mk openldap-2.4.40/build/top.mk
--- openldap-2.4.40.orig/build/top.mk 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/build/top.mk 2015-03-26 15:37:39.801077750 -0500
@@ -104,6 +104,9 @@
# LINK_LIBS referenced in library and module link commands.
LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS)
+# option to pass to $(CC) to support library symbol versioning, if any
+VERSION_OPTION = @VERSION_OPTION@
+
LTSTATIC = @LTSTATIC@
LTLINK = $(LIBTOOL) --mode=link \
@@ -113,7 +116,7 @@
$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(LIB_DEFS) -c
LTLINK_LIB = $(LIBTOOL) $(LTONLY_LIB) --mode=link \
- $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB)
+ $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_LIB) $(VERSION_FLAGS)
LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
$(CC) $(LT_CFLAGS) $(LT_CPPFLAGS) $(MOD_DEFS) -c
diff -Naur openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in
--- openldap-2.4.40.orig/configure.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/configure.in 2015-03-26 15:37:39.801077750 -0500
@@ -1916,6 +1916,13 @@
fi
AC_SUBST(LTSTATIC)dnl
+VERSION_OPTION=""
+OL_SYMBOL_VERSIONING
+if test $ol_cv_ld_version_script_option = yes ; then
+ VERSION_OPTION="-Wl,--version-script="
+fi
+AC_SUBST(VERSION_OPTION)
+
dnl ----------------------------------------------------------------
if test $ol_enable_wrappers != no ; then
AC_CHECK_HEADERS(tcpd.h,[
diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 openldap-2.4.40/doc/man/man5/slapd-bdb.5
--- openldap-2.4.40.orig/doc/man/man5/slapd-bdb.5 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/doc/man/man5/slapd-bdb.5 2015-03-26 15:36:59.637464038 -0500
@@ -135,7 +135,7 @@
associated indexes live.
A separate directory must be specified for each database.
The default is
-.BR LOCALSTATEDIR/openldap\-data .
+.BR LOCALSTATEDIR/lib/openldap .
.TP
.B dirtyread
Allow reads of modified but not yet committed data.
diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd-config.5 openldap-2.4.40/doc/man/man5/slapd-config.5
--- openldap-2.4.40.orig/doc/man/man5/slapd-config.5 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/doc/man/man5/slapd-config.5 2015-03-26 15:36:59.638464004 -0500
@@ -2051,7 +2051,7 @@
# The database directory MUST exist prior to
# running slapd AND should only be accessible
# by the slapd/tools. Mode 0700 recommended.
-olcDbDirectory: LOCALSTATEDIR/openldap\-data
+olcDbDirectory: LOCALSTATEDIR/lib/openldap
# Indices to maintain
olcDbIndex: objectClass eq
olcDbIndex: cn,sn,mail pres,eq,approx,sub
diff -Naur openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 openldap-2.4.40/doc/man/man5/slapd.conf.5
--- openldap-2.4.40.orig/doc/man/man5/slapd.conf.5 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/doc/man/man5/slapd.conf.5 2015-03-26 15:36:59.638464004 -0500
@@ -2021,7 +2021,7 @@
# The database directory MUST exist prior to
# running slapd AND should only be accessible
# by the slapd/tools. Mode 0700 recommended.
-directory LOCALSTATEDIR/openldap\-data
+directory LOCALSTATEDIR/lib/openldap
# Indices to maintain
index objectClass eq
index cn,sn,mail pres,eq,approx,sub
diff -Naur openldap-2.4.40.orig/include/ldap_defaults.h openldap-2.4.40/include/ldap_defaults.h
--- openldap-2.4.40.orig/include/ldap_defaults.h 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/include/ldap_defaults.h 2015-03-26 15:36:59.638464004 -0500
@@ -39,7 +39,7 @@
#define LDAP_ENV_PREFIX "LDAP"
/* default ldapi:// socket */
-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
+#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
/*
* SLAPD DEFINITIONS
@@ -47,7 +47,7 @@
/* location of the default slapd config file */
#define SLAPD_DEFAULT_CONFIGFILE LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
#define SLAPD_DEFAULT_CONFIGDIR LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
-#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
+#define SLAPD_DEFAULT_DB_DIR LDAP_RUNDIR LDAP_DIRSEP "lib" LDAP_DIRSEP "openldap"
#define SLAPD_DEFAULT_DB_MODE 0600
#define SLAPD_DEFAULT_UCDATA LDAP_DATADIR LDAP_DIRSEP "ucdata"
/* default max deref depth for aliases */
diff -Naur openldap-2.4.40.orig/libraries/liblber/Makefile.in openldap-2.4.40/libraries/liblber/Makefile.in
--- openldap-2.4.40.orig/libraries/liblber/Makefile.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/libraries/liblber/Makefile.in 2015-03-26 15:37:39.801077750 -0500
@@ -38,6 +38,9 @@
XXLIBS =
NT_LINK_LIBS = $(AC_LIBS)
UNIX_LINK_LIBS = $(AC_LIBS)
+ifneq (,$(VERSION_OPTION))
+ VERSION_FLAGS = "$(VERSION_OPTION)$(srcdir)/liblber.map"
+endif
dtest: $(XLIBS) dtest.o
$(LTLINK) -o $@ dtest.o $(LIBS)
@@ -48,6 +51,6 @@
install-local: FORCE
-$(MKDIR) $(DESTDIR)$(libdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
$(LTFINISH) $(DESTDIR)$(libdir)
diff -Naur openldap-2.4.40.orig/libraries/liblber/liblber.map openldap-2.4.40/libraries/liblber/liblber.map
--- openldap-2.4.40.orig/libraries/liblber/liblber.map 1969-12-31 18:00:00.000000000 -0600
+++ openldap-2.4.40/libraries/liblber/liblber.map 2015-03-26 15:37:39.801077750 -0500
@@ -0,0 +1,8 @@
+OPENLDAP_2.4_2 {
+ global:
+ ber_*;
+ der_alloc;
+ lutil_*;
+ local:
+ *;
+};
diff -Naur openldap-2.4.40.orig/libraries/libldap/Makefile.in openldap-2.4.40/libraries/libldap/Makefile.in
--- openldap-2.4.40.orig/libraries/libldap/Makefile.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/libraries/libldap/Makefile.in 2015-03-26 15:37:39.802077716 -0500
@@ -52,6 +52,9 @@
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+ifneq (,$(VERSION_OPTION))
+ VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map
+endif
apitest: $(XLIBS) apitest.o
$(LTLINK) -o $@ apitest.o $(LIBS)
@@ -68,7 +71,7 @@
install-local: $(CFFILES) FORCE
-$(MKDIR) $(DESTDIR)$(libdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
$(LTFINISH) $(DESTDIR)$(libdir)
-$(MKDIR) $(DESTDIR)$(sysconfdir)
@for i in $(CFFILES); do \
diff -Naur openldap-2.4.40.orig/libraries/libldap/libldap.map openldap-2.4.40/libraries/libldap/libldap.map
--- openldap-2.4.40.orig/libraries/libldap/libldap.map 1969-12-31 18:00:00.000000000 -0600
+++ openldap-2.4.40/libraries/libldap/libldap.map 2015-03-26 15:37:39.802077716 -0500
@@ -0,0 +1,7 @@
+OPENLDAP_2.4_2 {
+ global:
+ ldap_*;
+ ldif_*;
+ local:
+ *;
+};
diff -Naur openldap-2.4.40.orig/libraries/libldap_r/Makefile.in openldap-2.4.40/libraries/libldap_r/Makefile.in
--- openldap-2.4.40.orig/libraries/libldap_r/Makefile.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/libraries/libldap_r/Makefile.in 2015-03-26 15:37:39.802077716 -0500
@@ -61,6 +61,9 @@
XXXLIBS = $(LTHREAD_LIBS)
NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
+ifneq (,$(VERSION_OPTION))
+ VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map"
+endif
.links : Makefile
@for i in $(XXSRCS); do \
@@ -83,6 +86,6 @@
install-local: $(CFFILES) FORCE
-$(MKDIR) $(DESTDIR)$(libdir)
- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir)
$(LTFINISH) $(DESTDIR)$(libdir)
diff -Naur openldap-2.4.40.orig/servers/slapd/Makefile.in openldap-2.4.40/servers/slapd/Makefile.in
--- openldap-2.4.40.orig/servers/slapd/Makefile.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/servers/slapd/Makefile.in 2015-03-26 15:36:59.639463969 -0500
@@ -376,10 +376,10 @@
install-conf install-dbc-maybe install-schema install-tools
install-slapd: FORCE
- -$(MKDIR) $(DESTDIR)$(libexecdir)
+ -$(MKDIR) $(DESTDIR)$(sbindir)
-$(MKDIR) $(DESTDIR)$(localstatedir)/run
$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
- slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
+ slapd$(EXEEXT) $(DESTDIR)$(sbindir)
@for i in $(SUBDIRS); do \
if test -d $$i && test -f $$i/Makefile ; then \
echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \
@@ -445,9 +445,9 @@
install-db-config: FORCE
@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
- @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
+ @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/lib/openldap
$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
- $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
+ $(DESTDIR)$(localstatedir)/lib/openldap/DB_CONFIG.example
$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
@@ -455,6 +455,6 @@
-$(MKDIR) $(DESTDIR)$(sbindir)
for i in $(SLAPTOOLS); do \
$(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
- $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+ $(LN_S) -f $(DESTDIR)$(sbindir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
done
diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.conf openldap-2.4.44/servers/slapd/slapd.conf
--- openldap-2.4.44.orig/servers/slapd/slapd.conf 2016-02-06 00:57:45.000000000 +0100
+++ openldap-2.4.44/servers/slapd/slapd.conf 2016-02-22 23:01:47.681372594 +0100
@@ -10,12 +10,12 @@
# service AND an understanding of referrals.
#referral ldap://root.openldap.org
-pidfile %LOCALSTATEDIR%/run/slapd.pid
-argsfile %LOCALSTATEDIR%/run/slapd.args
+pidfile %LOCALSTATEDIR%/run/openldap/slapd.pid
+argsfile %LOCALSTATEDIR%/run/openldap/slapd.args
# Load dynamic backend modules:
-# modulepath %MODULEDIR%
-# moduleload back_mdb.la
+modulepath %MODULEDIR%
+moduleload back_mdb.la
# moduleload back_ldap.la
# Sample security restrictions
@@ -60,6 +60,6 @@
# The database directory MUST exist prior to running slapd AND
# should only be accessible by the slapd and slap tools.
# Mode 700 recommended.
-directory %LOCALSTATEDIR%/openldap-data
+directory %LOCALSTATEDIR%/lib/openldap
# Indices to maintain
index objectClass eq
diff -Naur openldap-2.4.44.orig/servers/slapd/slapd.ldif openldap-2.4.44/servers/slapd/slapd.ldif
--- openldap-2.4.44.orig/servers/slapd/slapd.ldif 2016-02-06 00:57:45.000000000 +0100
+++ openldap-2.4.44/servers/slapd/slapd.ldif 2016-02-22 22:59:57.824364446 +0100
@@ -9,8 +9,8 @@
#
# Define global ACLs to disable default read access.
#
-olcArgsFile: %LOCALSTATEDIR%/run/slapd.args
-olcPidFile: %LOCALSTATEDIR%/run/slapd.pid
+olcArgsFile: %LOCALSTATEDIR%/run/openldap/slapd.args
+olcPidFile: %LOCALSTATEDIR%/run/openldap/slapd.pid
#
# Do not enable referrals until AFTER you have a working directory
# service AND an understanding of referrals.
@@ -26,10 +26,11 @@
#
# Load dynamic backend modules:
#
-#dn: cn=module,cn=config
-#objectClass: olcModuleList
-#cn: module
-#olcModulepath: %MODULEDIR%
+dn: cn=module,cn=config
+objectClass: olcModuleList
+cn: module
+olcModulepath: %MODULEDIR%
+olcModuleload: back_mdb.la
#olcModuleload: back_bdb.la
#olcModuleload: back_hdb.la
#olcModuleload: back_ldap.la
@@ -90,6 +91,6 @@
# The database directory MUST exist prior to running slapd AND
# should only be accessible by the slapd and slap tools.
# Mode 700 recommended.
-olcDbDirectory: %LOCALSTATEDIR%/openldap-data
+olcDbDirectory: %LOCALSTATEDIR%/lib/openldap
# Indices to maintain
olcDbIndex: objectClass eq
diff -Naur openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in openldap-2.4.40/servers/slapd/slapi/Makefile.in
--- openldap-2.4.40.orig/servers/slapd/slapi/Makefile.in 2014-09-18 20:48:49.000000000 -0500
+++ openldap-2.4.40/servers/slapd/slapi/Makefile.in 2015-03-26 15:36:59.639463969 -0500
@@ -46,6 +46,6 @@
install-local: FORCE
if test "$(BUILD_MOD)" = "yes"; then \
$(MKDIR) $(DESTDIR)$(libdir); \
- $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir); \
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(libdir); \
fi
+10 -5
View File
@@ -12,7 +12,7 @@
<License>OPENLDAP</License>
<Summary>Open-source suite of LDAP applications and development tools</Summary>
<Description>OpenLDAP is an open-source suite of LDAP (Lightweight Directory Access Protocol) applications and development tools</Description>
<Archive sha1sum="c6880df9fec928a5f010b78a4285b497e8a12d6b" type="targz">ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.41.tgz</Archive>
<Archive sha1sum="016a738d050a68d388602a74b5e991035cdba149" type="targz">ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.44.tgz</Archive>
<BuildDependencies>
<Dependency>nss-devel</Dependency>
<Dependency>db-devel</Dependency>
@@ -20,11 +20,16 @@
<Dependency>tcp-wrappers-devel</Dependency>
<Dependency>cyrus-sasl-devel</Dependency>
<Dependency>libtool-ltdl</Dependency>
<Dependency>icu4c-devel</Dependency>
<!-- <Dependency>unixODBC-devel</Dependency> -->
<Dependency>libutil-linux-devel</Dependency>
<Dependency>e2fsprogs-devel</Dependency>
<Dependency>groff</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">openldap-2.4.39-blfs_paths-1.patch</Patch>
<Patch level="1">openldap-2.4.39-symbol_versions-1.patch</Patch>
<!-- <Patch level="1">openldap-2.4.39-blfs_paths-1.patch</Patch> -->
<Patch level="1">openldap-2.4.44-consolidated-2.patch</Patch>
<!-- <Patch level="1">openldap-2.4.39-symbol_versions-1.patch</Patch> -->
<Patch level="1">openldap-2.4.39-ntlm-1.patch</Patch>
<Patch level="1">fedora/openldap-sql-linking.patch</Patch>
<Patch level="1">fedora/openldap-reentrant-gethostby.patch</Patch>
@@ -124,8 +129,8 @@
<History>
<Update release="1">
<Date>2015-07-01</Date>
<Version>2.4.41</Version>
<Date>2016-03-27</Date>
<Version>2.4.44</Version>
<Comment>First release</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
+3 -3
View File
@@ -14,7 +14,7 @@
<IsA>app:console</IsA>
<Summary>Mesa graphics libraries and utilities</Summary>
<Description>Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.</Description>
<Archive sha1sum="0983b699538d4f096dbee78887ca4575c878e10a" type="targz">ftp://ftp.freedesktop.org/pub/mesa/older-versions/10.x/10.5.5/mesa-10.5.5.tar.gz</Archive>
<Archive sha1sum="a9600ccb8350ef490f1d3c3fa9d93bcb347b87b7" type="targz">ftp://ftp.freedesktop.org/pub/mesa/11.1.2/mesa-11.1.2.tar.gz</Archive>
<BuildDependencies>
<Dependency>llvm</Dependency>
<Dependency>llvm-libs</Dependency>
@@ -155,8 +155,8 @@
</Package>
<History>
<Update release="1">
<Date>2016-01-10</Date>
<Version>10.5.5</Version>
<Date>2016-03-27</Date>
<Version>11.1.2</Version>
<Comment>First release</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>