From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id 33A566B2E9 for ; Fri, 19 Jul 2013 15:21:35 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.3) with ESMTP id r6JFLbU5028754 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Fri, 19 Jul 2013 08:21:37 -0700 (PDT) Received: from yow-jmacdona-d1.ottawa.wrs.com (128.224.146.66) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server (TLS) id 14.2.342.3; Fri, 19 Jul 2013 08:21:35 -0700 Received: from yow-jmacdona-l1 (yow-jmacdona-d2.wrs.com [128.224.146.166]) by yow-jmacdona-d1.ottawa.wrs.com (Postfix) with ESMTP id 4BC087FE3; Fri, 19 Jul 2013 11:21:32 -0400 (EDT) Received: by yow-jmacdona-l1 (Postfix, from userid 1000) id 430DD404D8; Fri, 19 Jul 2013 11:21:33 -0400 (EDT) Date: Fri, 19 Jul 2013 11:21:33 -0400 From: Joe MacDonald To: Message-ID: <20130719152132.GA25061@windriver.com> References: <1374215371-23406-1-git-send-email-rongqing.li@windriver.com> MIME-Version: 1.0 In-Reply-To: <1374215371-23406-1-git-send-email-rongqing.li@windriver.com> X-URL: http://github.com/joeythesaint/joe-s-common-environment/tree/master X-Configuration: git://github.com/joeythesaint/joe-s-common-environment.git X-Editor: Vim-703 http://www.vim.org User-Agent: Mutt/1.5.21 (2010-09-15) Cc: openembedded-devel@lists.openembedded.org Subject: Re: [meta-networking][PATCH] cyrus-sasl: several fixes X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jul 2013 15:21:35 -0000 X-Groupsio-MsgNum: 45422 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="mYCpIKhGyMATD0i+" Content-Disposition: inline --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Merged, thanks. -J. [[meta-networking][PATCH] cyrus-sasl: several fixes] On 13.07.19 (Fri 14:29= ) rongqing.li@windriver.com wrote: > From: "Roy.Li" >=20 > 1. Fix hardcoded libdir > 2. configure cyrus-sasl based on PACKAGECONFIG > 3. create user by inherit useradd > 4. add -fPIC to CFLAG to fix the below building failure: > ld: ../sasldb/.libs/libsasldb.a(db_berkeley.o): relocation R_X86_= 64_32S against > `.rodata' can not be used when making a shared object; recompile = with -fPIC > ../sasldb/.libs/libsasldb.a(db_berkeley.o): could not read symbol= s: Bad value > The cause is that libsasldb.a is built twice since {.c.o: and .c.lo} c= o-exist, one > with -fPIC, other without -fPIC. if no -fPIC library follows behind, t= his error > will appear. so we enable -fPIC no matter whatever objects are built. > 5. The version of db in oe-core is 5.0 >=20 > Signed-off-by: Roy.Li > --- > .../cyrus-sasl/cyrus-sasl_2.1.26.bb | 31 ++++++++++++++= ++---- > .../cyrus-sasl/files/Fix-hardcoded-libdir.patch | 25 ++++++++++++++= ++ > 2 files changed, 51 insertions(+), 5 deletions(-) > create mode 100644 meta-networking/recipes-daemons/cyrus-sasl/files/Fix-= hardcoded-libdir.patch >=20 > diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26= =2Ebb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb > index 4311540..d8cb3d9 100644 > --- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb > +++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb > @@ -5,21 +5,39 @@ LICENSE =3D "BSD" > LIC_FILES_CHKSUM =3D "file://COPYING;md5=3D3f55e0974e3d6db00ca6f57f2d206= 396" > =20 > SRC_URI =3D "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${PV}.tar.gz \ > - file://avoid-to-call-AC_TRY_RUN.patch" > + file://avoid-to-call-AC_TRY_RUN.patch \ > + file://Fix-hardcoded-libdir.patch"=20 > =20 > -inherit autotools pkgconfig > +inherit autotools pkgconfig useradd > =20 > EXTRA_OECONF +=3D "--with-dblib=3Dberkeley \ > --with-bdb-libdir=3D${STAGING_LIBDIR} \ > --with-bdb-incdir=3D${STAGING_INCDIR} \ > - --without-pam --without-opie --without-des \ > + --with-bdb=3Ddb-5.3 \ > + --with-plugindir=3D"${libdir}/sasl2/" \ > andrew_cv_runpath_switch=3Dnone" > =20 > -PACKAGECONFIG ??=3D "" > +PACKAGECONFIG ??=3D "ntlm \ > + ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ > + ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ > + " > PACKAGECONFIG[gssapi] =3D "--enable-gssapi=3Dyes,--enable-gssapi=3Dno,kr= b5," > +PACKAGECONFIG[pam] =3D "--with-pam,--without-pam,libpam," > +PACKAGECONFIG[opie] =3D "--with-opie,--without-opie,opie," > +PACKAGECONFIG[des] =3D "--with-des,--without-des,," > +PACKAGECONFIG[ldap] =3D "--with-ldap=3D${STAGING_LIBDIR} --enable-ldapdb= ,--without-ldap --disable-ldapdb,openldap," > +PACKAGECONFIG[ntlm] =3D "--with-ntlm,--without-ntlm,," > + > +CFLAGS +=3D "-fPIC" > =20 > do_configure_prepend () { > rm -f acinclude.m4 config/libtool.m4 > + > + # make it be able to work with db 5.0 version > + local sed_files=3D"sasldb/db_berkeley.c utils/dbconverter-2.c" > + for sed_file in $sed_files; do > + sed -i 's#DB_VERSION_MAJOR =3D=3D 4.*#(&) || DB_VERSION_MAJOR = =3D=3D 5#' $sed_file > + done > } > =20 > do_compile_prepend () { > @@ -29,8 +47,11 @@ do_compile_prepend () { > cd .. > } > =20 > +USERADD_PACKAGES =3D "${PN}-bin" > +GROUPADD_PARAM_${PN}-bin =3D "--system mail" > +USERADD_PARAM_${PN}-bin =3D "--system --home=3D/var/spool/mail -g mail c= yrus" > + > pkg_postinst_${PN}-bin () { > - grep cyrus /etc/passwd || adduser --disabled-password --home=3D/var/= spool/mail --ingroup mail -g "Cyrus sasl" cyrus > echo "cyrus" | saslpasswd2 -p -c cyrus > chgrp mail /etc/sasldb2 > } > diff --git a/meta-networking/recipes-daemons/cyrus-sasl/files/Fix-hardcod= ed-libdir.patch b/meta-networking/recipes-daemons/cyrus-sasl/files/Fix-hard= coded-libdir.patch > new file mode 100644 > index 0000000..3fa8431 > --- /dev/null > +++ b/meta-networking/recipes-daemons/cyrus-sasl/files/Fix-hardcoded-libd= ir.patch > @@ -0,0 +1,25 @@ > +Fix hardcoded libdir. > + > +Upstream-Status: Pending=20 > + > +Signed-off-by: Roy.Li > +--- > + plugins/Makefile.am | 2 +- > + 1 files changed, 1 insertions(+), 1 deletions(-) > + > +diff --git a/plugins/Makefile.am b/plugins/Makefile.am > +index b00915f..25262a1 100644 > +--- a/plugins/Makefile.am > ++++ b/plugins/Makefile.am > +@@ -62,7 +62,7 @@ plugindir =3D @plugindir@ > +=20 > + common_sources =3D plugin_common.c plugin_common.h > +=20 > +-sasldir =3D $(prefix)/lib/sasl2 > ++sasldir =3D $(libdir)/sasl2 > + sasl_LTLIBRARIES =3D @SASL_MECHS@ > + EXTRA_LTLIBRARIES =3D libplain.la libanonymous.la libkerberos4.la libcr= ammd5.la \ > + libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.= la \ > +--=20 > +1.7.4.1 > + --=20 -Joe MacDonald. :wq --mYCpIKhGyMATD0i+ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlHpWXwACgkQPN8S4W6ZZnfT5gCfX6JiSPFLaEVUyn2gYdyzpwcH lWwAn2d8wMqgklnfbQxeqME8mv+Bs//E =PFlr -----END PGP SIGNATURE----- --mYCpIKhGyMATD0i+--