Re: flash10 vs f10
Boris Samorodov
> On Fri, Jun 26, 2009 at 03:33:15PM -0500, Sean C. Farley wrote:
>> On Fri, 26 Jun 2009, Renato Botelho wrote:
>>
>> > On Fri, Jun 26, 2009 at 4:32 PM, Boris Samorodov<bs...@ipt.ru> wrote:
>> >> OK, thanks! I should have missed you previous post.
>> >>
>> >> Here is a port for tests. This shar should be run at /usr/ports/www:
>> >> ftp://ftp.ipt.ru/pub/linux/linux-f10-flashplugin10.shar
>> >>
>> >> Note: the port is only hand-written and tested to build/install/deinstall.
>> >
>> > I tried it and got this message:
>> >
>> > *** NSPlugin Wrapper *** ERROR: NPP_New() wait for reply: Message timeout
>> >
>> > My environment:
>> >
>> > FreeBSD botelhor.bplab.local 8.0-CURRENT FreeBSD 8.0-CURRENT #73
>> > r194284: Wed Jun 24 19:09:04 BRT 2009
>> > ro...@botelhor.bplab.local:/usr/obj/usr/src/sys/GARGA i386
>> >
>> > linux-f10-atk-1.24.0
>> > linux-f10-cairo-1.8.0
>> > linux-f10-curl-7.19.4_1
>> > linux-f10-expat-2.0.1
>> > linux-f10-flashplugin-10.0r22
>> > linux-f10-fontconfig-2.6.0
>> > linux-f10-gtk2-2.14.7
>> > linux-f10-jpeg-6b
>> > linux-f10-libssh2-0.18
>> > linux-f10-nspr-4.7.3
>> > linux-f10-nss-3.12.2.0
>> > linux-f10-openssl-0.9.8g
>> > linux-f10-pango-1.22.3
>> > linux-f10-png-1.2.35
>> > linux-f10-sqlite3-3.5.9
>> > linux-f10-tiff-3.8.2
>> > linux-f10-xorg-libs-7.4
>> > linux_base-f10-10
>> > nspluginwrapper-1.2.2_2
>> >
>> > I deinstalled linux-f8, cleaned compat/linux and reinstalled everything.
>>
>> Assuming it is the issue with missing dependencies for libcurl, we also
>> need port(s) for liblber and libldap since f10's libcurl depends upon
>> them.
>
> liblber is in the same rpm with libldap (I used
> openldap-2.4.12-1.fc10.i386.rpm as I said), and as I said we
> also need libsasl2 (libldap depends on it) which is in
> cyrus-sasl-lib-2.1.22-19.fc10.i386.rpm .
>
>> I had to manually extract a couple of RPM's to get them. Here is
>> the ldd output of libcurl for me:
>>
>> # /compat/linux/bin/sh /compat/linux/usr/bin/ldd /compat/linux/usr/lib/libcurl.so.4.1.1
>> libidn.so.11 => /lib/libidn.so.11 (0x20073000)
>> libssh2.so.1 => /usr/lib/libssh2.so.1 (0x200a5000)
>> libldap-2.4.so.2 => /usr/lib/libldap-2.4.so.2 (0x200c7000)
>> librt.so.1 => /lib/librt.so.1 (0x20109000)
>> libgssapi_krb5.so.2 => /usr/lib/libgssapi_krb5.so.2 (0x20113000)
>> libkrb5.so.3 => /usr/lib/libkrb5.so.3 (0x20141000)
>> libk5crypto.so.3 => /usr/lib/libk5crypto.so.3 (0x201e1000)
>> libcom_err.so.2 => /lib/libcom_err.so.2 (0x20206000)
>> libz.so.1 => /lib/libz.so.1 (0x20209000)
>> libssl3.so => /lib/libssl3.so (0x2021d000)
>> libsmime3.so => /lib/libsmime3.so (0x2024e000)
>> libnss3.so => /lib/libnss3.so (0x20275000)
>> libplds4.so => /lib/libplds4.so (0x203bb000)
>> libplc4.so => /lib/libplc4.so (0x203bf000)
>> libnspr4.so => /lib/libnspr4.so (0x203c4000)
>> libpthread.so.0 => /lib/libpthread.so.0 (0x203fe000)
>> libdl.so.2 => /lib/libdl.so.2 (0x20418000)
>> libc.so.6 => /lib/libc.so.6 (0x2041d000)
>> libssl.so.7 => /lib/libssl.so.7 (0x20596000)
>> libcrypto.so.7 => /lib/libcrypto.so.7 (0x205e1000)
>> liblber-2.4.so.2 => /usr/lib/liblber-2.4.so.2 (0x20735000)
>> libresolv.so.2 => /lib/libresolv.so.2 (0x20744000)
>> libsasl2.so.2 => /usr/lib/libsasl2.so.2 (0x2075b000)
>> /lib/ld-linux.so.2 (0x00000000)
>> libkrb5support.so.0 => /usr/lib/libkrb5support.so.0 (0x20775000)
>> libkeyutils.so.1 => /lib/libkeyutils.so.1 (0x2077f000)
>> libnssutil3.so => /lib/libnssutil3.so (0x20782000)
>> libcrypt.so.1 => /lib/libcrypt.so.1 (0x2079b000)
>> libselinux.so.1 => /lib/libselinux.so.1 (0x207cf000)
>
> Same here with the following ports I just tested here: (thanx to bsam
> for the linux-f10-flashplugin10 port and to Peter Jeremy for the
> original linux-f10-openldap and linux-f10-cyrus-sasl2 ports!)
>
> First a patch for bsd.linux-apps.mk, then the shar, please test
> and comment :)
Good work! Here are some comments.
> Index: Mk/bsd.linux-apps.mk
> @@ -70,7 +70,8 @@
> _LINUX_APPS_ALL+=
>
> # 2.6.16 components
> -_LINUX_26_APPS= libidn libssh2 nspr nss sqlite3 tcl84 tk84
> +_LINUX_26_APPS= cyrus-sasl2 libidn libssh2 nspr nss openldap \
> + sqlite3 tcl84 tk84
>
> _LINUX_APPS_ALL+= ${_LINUX_26_APPS}
>
> @@ -137,6 +138,11 @@
> curl_DETECT= ${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl
Since linux-f10 curl requires cyrus-sasl2 and openldap I'd add here:
-----
. if ${LINUX_DIST_SUFFIX} == "-f10"
curl_DEPENDS=cyrus-sasl2 openldap
. endif
-----
Also apropriate changes should go to ftp/linux-f10-curl port.
> +# no cyrus-sasl2_FILE, cyrus-sasl2_f8_FILE
> +cyrus-sasl2_f10_FILE= ${LINUXBASE}/usr/lib/libsasl2.so.2.0.22
> +cyrus-sasl2_DETECT= ${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> +cyrus-sasl2_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-cyrus-sasl2
> +
> dri_FILE= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1
> dri_f8_FILE= ${LINUXBASE}/usr/lib/libGL.so.1
> dri_f10_FILE= ${LINUXBASE}/usr/lib/libGL.so.1.2
> @@ -307,6 +313,11 @@
> mikmod_DETECT= ${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> mikmod_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod
>
> +# no openldap_FILE, openldap_f8_FILE
> +openldap_f10_FILE= ${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0
> +openldap_DETECT= ${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> +openldap_PORT= ${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-openldap
> +
> openmotif_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
> openmotif_f8_FILE= ${LINUXBASE}/usr/lib/libXm.so.4.0.2
> openmotif_f10_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
>
> # This is a shell archive. Save it in a file, remove anything before
> # this line, and then unpack it by entering "sh file". Note, it may
> # create directories; files and directories will be owned by you and
> # have default permissions.
> #
> # This archive contains:
> #
> # net/linux-f10-openldap/
> # net/linux-f10-openldap/Makefile
> # net/linux-f10-openldap/distinfo.i386
> # security/linux-f10-cyrus-sasl2/
> # security/linux-f10-cyrus-sasl2/Makefile
> # security/linux-f10-cyrus-sasl2/distinfo.i386
> # www/linux-f10-flashplugin10/
> # www/linux-f10-flashplugin10/Makefile
> # www/linux-f10-flashplugin10/distinfo
> # www/linux-f10-flashplugin10/pkg-descr
> # www/linux-f10-flashplugin10/pkg-plist
> #
> echo c - net/linux-f10-openldap/
> mkdir -p net/linux-f10-openldap/ > /dev/null 2>&1
> echo x - net/linux-f10-openldap/Makefile
> sed 's/^X//' >net/linux-f10-openldap/Makefile << '17a12d65b66950d2cbc504ac86a37255'
> X# New ports collection makefile for: net/linux-f10-openldap
> X# Date created: 2009-06-07
> X# Whom: peter
> X#
> X# $FreeBSD$
> X#
> X
> XPORTNAME= openldap
> XPORTVERSION= 2.4.12
> XCATEGORIES= net linux
> XPKGNAMEPREFIX= linux-f10-
> XDISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
> X
> X.if defined(PACKAGE_BUILDING)
> XSRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}.src.rpm
> XALWAYS_KEEP_DISTFILES= YES
> X.endif
Well, those <.if, .endif> actually are not needed as bsd.linux-rpm.mk
should itself take care of the case. If it doesn't, please tell me.
> X
> XMAINTAINER= emul...@FreeBSD.org
> XCOMMENT= Lightweight Directory Access Protocol libraries (Linux Fedora 10)
> X
> X#CONFLICTS=
> X
> XUSE_LINUX_RPM= yes
> XLINUX_DIST_VER= 10
> XRPMVERSION= 1.fc10
> XUSE_LDCONFIG= yes
> XDESCR= ${.CURDIR}/../openldap24-server/pkg-descr
> X
> XPLIST_DIRS= etc/openldap/cacerts etc/openldap
I'd say only etc/openldap is needed (see below).
> XPLIST_FILES= etc/openldap/ldap.conf usr/lib/liblber-2.4.so.2 usr/lib/liblber-2.4.so.2.2.0 usr/lib/libldap-2.4.so.2 usr/lib/libldap-2.4.so.2.2.0 usr/lib/libldap_r-2.4.so.2 usr/lib/libldap_r-2.4.so.2.2.0
> XDOCSDIR= usr/share/doc/${PORTNAME}-${PORTVERSION}
> XPORTDOCS= ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
> XMANPREFIX= ${PREFIX}/usr/share
> XMAN5= ldap.conf.5 ldif.5
> XMANCOMPRESSED= yes
At my port's propotype I have this:
-----
# do not install any openldap configuration directories/files
post-extract:
${RM} -rf ${WRKSRC}/etc
# use a native openldap configuration directories/files
post-install:
${LN} -sf ${LOCALBASE}/etc/openldap ${PREFIX}/etc
-----
This should work for managing the port via ports system but not with
packages.
> X
> X.include <bsd.port.mk>
> 17a12d65b66950d2cbc504ac86a37255
> echo x - net/linux-f10-openldap/distinfo.i386
> sed 's/^X//' >net/linux-f10-openldap/distinfo.i386 << 'f422178bbd4668750265f4e584e91c0e'
> XMD5 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = e3ea12058a8cdc54d6f270c802c92a00
> XSHA256 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 2a71dcfdbfb1dc9b4e056c951518474d5958147c033f3584dc06e784fd67d567
> XSIZE (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 323504
The following commands would do the right thing (no src distinfo for
now):
-----
% cd <the port directory>
% sudo make fetch PACKAGE_BUILDING=YES
% sudo make makesum PACKAGE_BUILDING=YES
-----
> f422178bbd4668750265f4e584e91c0e
> echo c - security/linux-f10-cyrus-sasl2/
> mkdir -p security/linux-f10-cyrus-sasl2/ > /dev/null 2>&1
> echo x - security/linux-f10-cyrus-sasl2/Makefile
> sed 's/^X//' >security/linux-f10-cyrus-sasl2/Makefile << '4fc58bcf97a8889077c61da23cb55faa'
> X# New ports collection makefile for: security/linux-f10-cyrus-sasl2
> X# Date created: 2009-06-07
> X# Whom: peter
> X#
> X# $FreeBSD$
> X#
> X
> XPORTNAME= cyrus-sasl2
> XPORTVERSION= 2.1.22
> XCATEGORIES= security linux
> XPKGNAMEPREFIX= linux-f10-
> XDISTNAME= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
> X
> X.if defined(PACKAGE_BUILDING)
> XSRC_DISTFILES= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}.src.rpm
> XALWAYS_KEEP_DISTFILES= YES
> X.endif
This is not right. I propose to add (somewhere further) instead
of the last four lines:
-----
SRC_DISTFILES=cyrus-sasl-${PORTVERSION}-${RPMVERSION}.src.rpm
-----
> X
> XMAINTAINER= emul...@FreeBSD.org
> XCOMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) (Linux Fedora 10)
> X
> X#CONFLICTS=
> X
> XUSE_LINUX_RPM= yes
> XLINUX_DIST_VER= 10
> XRPMVERSION= 19.fc10
> XUSE_LDCONFIG= yes
> XBRANDELF_FILES= usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
> XDESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
> X
> XPLIST_DIRS= etc/sasl2 usr/lib/sasl2
> XPLIST_FILES= usr/lib/libsasl2.so.2 usr/lib/libsasl2.so.2.0.22 usr/lib/sasl2/libanonymous.so usr/lib/sasl2/libanonymous.so.2 usr/lib/sasl2/libanonymous.so.2.0.22 usr/lib/sasl2/libsasldb.so usr/lib/sasl2/libsasldb.so.2 usr/lib/sasl2/libsasldb.so.2.0.22 usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
> XDOCSDIR= usr/share/doc/cyrus-sasl-lib-${PORTVERSION}
> XPORTDOCS= AUTHORS COPYING NEWS README advanced.html appconvert.html components.html gssapi.html index.html install.html macosx.html mechanisms.html options.html plugprog.html programming.html readme.html sysadmin.html upgrading.html windows.html
> X
> X.include <bsd.port.mk>
> 4fc58bcf97a8889077c61da23cb55faa
> echo x - security/linux-f10-cyrus-sasl2/distinfo.i386
> sed 's/^X//' >security/linux-f10-cyrus-sasl2/distinfo.i386 << '9c7e54bf867023e1f8fcaa16319c72f4'
> XMD5 (rpm/i386/fedora/10/cyrus-sasl-lib-2.1.22-19.fc10.i386.rpm) = 5a4ee3c84ec9581723fd56b658eec994
> XSHA256 (rpm/i386/fedora/10/cyrus-sasl-lib-2.1.22-19.fc10.i386.rpm) = ae8da4ee07615519c657ddbe3b8c128a2e81f00a4db0da17b7369dabe03ed6d2
> XSIZE (rpm/i386/fedora/10/cyrus-sasl-lib-2.1.22-19.fc10.i386.rpm) = 145305
> 9c7e54bf867023e1f8fcaa16319c72f4
The same comment about distinfo as for net/linux-f10-openldap.
> echo c - www/linux-f10-flashplugin10/
> mkdir -p www/linux-f10-flashplugin10/ > /dev/null 2>&1
> echo x - www/linux-f10-flashplugin10/Makefile
> sed 's/^X//' >www/linux-f10-flashplugin10/Makefile << '5455d901d257b50d731e64397ea6df2f'
> X# New ports collection makefile for: www/linux-f10-flashplugin10
This port should be probably first repocopied from
www/linux-f8-flashplugin10 and then committed.
> X# Date created: 2009-06-26
> X# Whom: bsam
> X# Based on: www/linux-f8-flashplugin10 by nox@
> X#
> X# $FreeBSD$
> X#
> X
> XPORTNAME= flashplugin
> XPORTVERSION= 10.0r22
> XCATEGORIES= www multimedia linux
> XMASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/:plugin \
> X ftp://ftp.ipt.ru/pub/download/:suplib
> XPKGNAMEPREFIX= linux-f10-
> XDISTFILES= install_flash_player_10_linux.tar.gz:plugin \
> X linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
> XDIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
> X
> XMAINTAINER= emul...@FreeBSD.org
> XCOMMENT= Adobe Flash Player NPAPI Plugin
> X
> XONLY_FOR_ARCHS= amd64 i386
> XUSE_LINUX= yes
> XUSE_LINUX_APPS= openssl curl cyrus-sasl2 libssh2 nspr nss openldap
> X
> XRESTRICTED= Redistribution not allowed
> XRESTRICTED_FILES= ${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
> X
> XNO_BUILD= yes
> XWRKSRC= ${WRKDIR}/install_flash_player_10_linux
> X
> XUSE_NPAPI= linux-*
> XNPAPI_FILES= libflashplayer.so
> X
> XCONFLICTS= linux-flashplugin-7* linux-flashplugin-9* linux-f8-flashplugin10-*
> X
> Xpost-install:
> X @${INSTALL_PROGRAM} ${WRKDIR}/libflashsupport.so ${LINUXBASE}/usr/lib
> X
> X.include <bsd.port.pre.mk>
> X.include "${PORTSDIR}/www/linux-mplayer-plugin/Makefile.npapi"
> X.include <bsd.port.post.mk>
> 5455d901d257b50d731e64397ea6df2f
> echo x - www/linux-f10-flashplugin10/distinfo
> sed 's/^X//' >www/linux-f10-flashplugin10/distinfo << '1f552e2e0c05a396106217e48ff92103'
> XMD5 (flashplugin/10.0r22/install_flash_player_10_linux.tar.gz) = 23e4c2b844db0f87ff62084178aa2b1f
> XSHA256 (flashplugin/10.0r22/install_flash_player_10_linux.tar.gz) = cd29f166c87fecc943e88fe951bb61c56728fab12b4bf343badafa73ea95394e
> XSIZE (flashplugin/10.0r22/install_flash_player_10_linux.tar.gz) = 3994294
> XMD5 (flashplugin/10.0r22/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 6e416c81497f65065d78dae1e0acad0d
> XSHA256 (flashplugin/10.0r22/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
> XSIZE (flashplugin/10.0r22/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
> 1f552e2e0c05a396106217e48ff92103
> echo x - www/linux-f10-flashplugin10/pkg-descr
> sed 's/^X//' >www/linux-f10-flashplugin10/pkg-descr << '57a1420ff5e8cb1b77c71ecb3a15c599'
> XThis is the official Flash Player from Adobe. This plugin enables
> Xyou to see .swf and .spl files on the 'net from your Opera, Mozilla or
> XFirefox sessions.
> X
> XPlease see the Adobe home page for more information.
> X
> XFreeBSD Flash License Agreement:
> X http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/96374
> X
> XWWW: http://www.adobe.com/
> 57a1420ff5e8cb1b77c71ecb3a15c599
> echo x - www/linux-f10-flashplugin10/pkg-plist
> sed 's/^X//' >www/linux-f10-flashplugin10/pkg-plist << '9254ee58cdc375ce93f8fc3b1afc9e77'
> X@cwd /compat/linux
> Xusr/lib/libflashsupport.so
> X@cwd
> 9254ee58cdc375ce93f8fc3b1afc9e77
> exit
There may be something more, but I don't see it right now. Thanks for
all involved! It's a good team work.
WBR
--
bsam
_______________________________________________
freebsd...@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-curre...@freebsd.org"
Boris Samorodov
> On Sat, Jun 27, 2009 at 08:10:10PM +0400, Boris Samorodov wrote:
>> Juergen Lock <n...@jelal.kn-bremen.de> writes:
>> > X# New ports collection makefile for: net/linux-f10-openldap
>> > X# Date created: 2009-06-07
>> > X# Whom: peter
>> > X#
>> > X# $FreeBSD$
>> > X#
>> > X
>> > XPORTNAME= openldap
>> > XPORTVERSION= 2.4.12
>> > XCATEGORIES= net linux
>> > XPKGNAMEPREFIX= linux-f10-
>> > XDISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}
>> > X
>> > X.if defined(PACKAGE_BUILDING)
>> > XSRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}.src.rpm
>> > XALWAYS_KEEP_DISTFILES= YES
>> > X.endif
>>
>> Well, those <.if, .endif> actually are not needed as bsd.linux-rpm.mk
>> should itself take care of the case. If it doesn't, please tell me.
>>
> Ah, then a bunch of other ports can be changed too... (I guess Peter
> just went by existing examples :)
I should have been more verbose here. The whole if-endif case was
not needed because SRC_DISTFILES=${DISTNAME}.src.rpm. This is true for
net/linux-f10-openldap. But for security/linux-f10-cyrus-sasl2 it is not
true and SRC_DISTFILES should be defined at Makefile.
> Good idea, but actually the post-install target isn't really needed
> since the linuxolator /compat/linux search magic should already dtrt
> here. (I.e. if the dir doesn't exits it should fall back to the one
> outside of /compat/linux.)
The linuxulator magic will work if a linux program search not
only at /etc/openldap but also at /usr/local/etc/openldap.
I guess it won't happen.
The linuxulator do a search for a /some/path/file at:
. /compat/linux/some/path/file, if not found
. /some/path/file, if not found
. /compat/linux/some/path/file.
Anyway, we are talking here about correct linux openldap work.
But for the sake of linux-f10-flashplugin10 imho it's not
critical.
>> > X
>> > X.include <bsd.port.mk>
>> > 17a12d65b66950d2cbc504ac86a37255
>> > echo x - net/linux-f10-openldap/distinfo.i386
>> > sed 's/^X//' >net/linux-f10-openldap/distinfo.i386 << 'f422178bbd4668750265f4e584e91c0e'
>> > XMD5 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = e3ea12058a8cdc54d6f270c802c92a00
>> > XSHA256 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 2a71dcfdbfb1dc9b4e056c951518474d5958147c033f3584dc06e784fd67d567
>> > XSIZE (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 323504
>>
>> The following commands would do the right thing (no src distinfo for
>> now):
>> -----
>> % cd <the port directory>
>> % sudo make fetch PACKAGE_BUILDING=YES
>> % sudo make makesum PACKAGE_BUILDING=YES
>> -----
>>
> Done. (Actually makesum depends on fetch :)
Yea, but I usually fetch with sudo (to /usr/ports/distfiles)
but do a makesum without it (at my home work directory). ;-)
> New patch and shar below:
>
> Index: Mk/bsd.linux-apps.mk
> @@ -70,7 +70,8 @@
> _LINUX_APPS_ALL+=
>
> # 2.6.16 components
> -_LINUX_26_APPS= libidn libssh2 nspr nss sqlite3 tcl84 tk84
> +_LINUX_26_APPS= cyrus-sasl2 libidn libssh2 nspr nss openldap \
> + sqlite3 tcl84 tk84
>
> _LINUX_APPS_ALL+= ${_LINUX_26_APPS}
>
> @@ -136,6 +137,14 @@
> curl_f10_FILE= ${LINUXBASE}/usr/lib/libcurl.so.4.1.1
> curl_DETECT= ${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl
> +. if ${LINUX_DIST_SUFFIX} == "-f10"
> +curl_DEPENDS= cyrus-sasl2 openldap
> +. endif
> +
> +# no cyrus-sasl2_FILE, cyrus-sasl2_f8_FILE
> +cyrus-sasl2_f10_FILE= ${LINUXBASE}/usr/lib/libsasl2.so.2.0.22
> +cyrus-sasl2_DETECT= ${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> +cyrus-sasl2_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-cyrus-sasl2
>
> dri_FILE= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1
> dri_f8_FILE= ${LINUXBASE}/usr/lib/libGL.so.1
> @@ -307,6 +316,11 @@
> mikmod_DETECT= ${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> mikmod_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod
>
> +# no openldap_FILE, openldap_f8_FILE
> +openldap_f10_FILE= ${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0
> +openldap_DETECT= ${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> +openldap_PORT= ${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-openldap
> +
> openmotif_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
> openmotif_f8_FILE= ${LINUXBASE}/usr/lib/libXm.so.4.0.2
> openmotif_f10_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
> Index: ftp/linux-f10-curl/Makefile
Seems like PORTREVISION should be bumped.
[...]
> @@ -24,6 +24,7 @@
> CONFLICTS= linux-curl-[0-9]* linux-f8-curl-[0-9]*
>
> USE_LINUX_RPM= yes
> +USE_LINUX_APPS= cyrus-sasl2 openldap
> LINUX_DIST_VER= 10
> RPMVERSION= 5.fc10
> USE_LDCONFIG= yes
> XSRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}.src.rpm
Sorry that I wasn't verbose for the first time, this line is not needed
here.
No more comments from me. ;-)
Thanks!
Boris Samorodov
> New patch and shar:
No more comments from me, thanks!
Juergen Lock
> Juergen Lock <n...@jelal.kn-bremen.de> writes:
>
> > New patch and shar:
>
> No more comments from me, thanks!
Ok. Has anyone tested this yet tho? (Besides me in a vm... :)
Juergen
Brandon Gooch
:
> On Sun, Jun 28, 2009 at 04:40:20PM +0400, Boris Samorodov wrote:
>> Juergen Lock <n...@jelal.kn-bremen.de> writes:
>>
>>
>> No more comments from me, thanks!
>
>
I have. I'm using it with about the same level of success as the
previous versions of Flash (I need to map a couple of keys to run
`pkill npviewer.bin`).
Nevertheless, thanks for this!
-Brandon
Chagin Dmitry
--82I3+IH0IqGh5yIs
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sun, Jun 28, 2009 at 04:29:49PM +0000, Brandon Gooch wrote:
> On Sun, Jun 28, 2009 at 2:10 PM, Juergen Lock<n...@jelal.kn-bremen.de> wro=
te:
> > On Sun, Jun 28, 2009 at 04:40:20PM +0400, Boris Samorodov wrote:
> >> Juergen Lock <n...@jelal.kn-bremen.de> writes:
> >>
> >> > =9ANew patch and shar:
> >>
> >> No more comments from me, thanks!
> >
> > Ok. =9AHas anyone tested this yet tho? =9A(Besides me in a vm... :)
> >
>=20
> I have. I'm using it with about the same level of success as the
> previous versions of Flash (I need to map a couple of keys to run
> `pkill npviewer.bin`).
>=20
for amd64 try: compat.linux32.maxssiz=3D4194304
for i386 try: limit stacksize to 4mb or set unlimited.
> Nevertheless, thanks for this!
>=20
> -Brandon
> _______________________________________________
> freebsd...@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-curre...@freebsd.org"
--=20
Have fun!
chd
--82I3+IH0IqGh5yIs
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.10 (FreeBSD)
iEYEARECAAYFAkpHoGIACgkQ0t2Tb3OO/O3gSACfeZFyb/RFkDpu81UaLWWSvVgN
lPcAoMq8JFPWhloyxVIWdXnA9Zb992BH
=Q2b/
-----END PGP SIGNATURE-----
--82I3+IH0IqGh5yIs--
Sean C. Farley
> On Sun, Jun 28, 2009 at 04:29:49PM +0000, Brandon Gooch wrote:
*snip*
>> I have. I'm using it with about the same level of success as the
>> previous versions of Flash (I need to map a couple of keys to run
>> `pkill npviewer.bin`).
I also have a key mapping to killall npviewer.bin.
> for amd64 try: compat.linux32.maxssiz=4194304
>
> for i386 try: limit stacksize to 4mb or set unlimited.
Thank you. I tested viewing "TXT ISLAND" on YouTube. Works at higher
limits for me such as 32MB but not at my default of 64MB.
Why/how does this help? At least on i386, it stops Flash from choking
on YouTube videos when switching to HD or jumping within a video.
Sean
--
s...@FreeBSD.org
Chagin Dmitry
--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sun, Jun 28, 2009 at 12:39:09PM -0500, Sean C. Farley wrote:
> On Sun, 28 Jun 2009, Chagin Dmitry wrote:
>=20
> > On Sun, Jun 28, 2009 at 04:29:49PM +0000, Brandon Gooch wrote:
>=20
> *snip*
>=20
> >> I have. I'm using it with about the same level of success as the=20
> >> previous versions of Flash (I need to map a couple of keys to run=20
> >> `pkill npviewer.bin`).
>=20
> I also have a key mapping to killall npviewer.bin.
>=20
> > for amd64 try: compat.linux32.maxssiz=3D4194304
> >
> > for i386 try: limit stacksize to 4mb or set unlimited.
>=20
> Thank you. I tested viewing "TXT ISLAND" on YouTube. Works at higher=20
> limits for me such as 32MB but not at my default of 64MB.
>=20
> Why/how does this help? At least on i386, it stops Flash from choking=20
> on YouTube videos when switching to HD or jumping within a video.
>=20
the reason? foolish waves in a Uli head and stupid bug in flash plugin.
flash uses pthread_detach() after pthread_join() call.
glibc allows such behaviour (if stack limit < 40Mb) piece of shit...
--=20
Have fun!
chd
--envbJBWh7q8WU6mo
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.10 (FreeBSD)
iEYEARECAAYFAkpHrMMACgkQ0t2Tb3OO/O3N3ACeJFyr+93f7LDKOilE+e0HkdIh
yjsAn1JpsMBxG1PAegyHzazA2LpPwg3M
=gaUb
-----END PGP SIGNATURE-----
--envbJBWh7q8WU6mo--
Boris Samorodov
> On Sun, Jun 28, 2009 at 12:39:09PM -0500, Sean C. Farley wrote:
>> On Sun, 28 Jun 2009, Chagin Dmitry wrote:
>>
>> > On Sun, Jun 28, 2009 at 04:29:49PM +0000, Brandon Gooch wrote:
>>
>>
>> >> I have. I'm using it with about the same level of success as the
>>
>> I also have a key mapping to killall npviewer.bin.
>>
>> >
>> > for i386 try: limit stacksize to 4mb or set unlimited.
>>
>>
>
> flash uses pthread_detach() after pthread_join() call.
> glibc allows such behaviour (if stack limit < 40Mb) piece of shit...
If that helps then it's a good idea to create a pkg-message for
the port (Juergen Lock is CCed).
WBR
--
bsam
Brandon Gooch
> Chagin Dmitry <dch...@freebsd.org> writes:
>> On Sun, Jun 28, 2009 at 12:39:09PM -0500, Sean C. Farley wrote:
>>> On Sun, 28 Jun 2009, Chagin Dmitry wrote:
>>>
>>> > On Sun, Jun 28, 2009 at 04:29:49PM +0000, Brandon Gooch wrote:
>>>
>>> *snip*
>>>
>>> >> I have. I'm using it with about the same level of success as the
>>> >> previous versions of Flash (I need to map a couple of keys to run
>>> >> `pkill npviewer.bin`).
>>>
>>> I also have a key mapping to killall npviewer.bin.
>>>
>>> >
>>> > for i386 try: limit stacksize to 4mb or set unlimited.
>>>
her
>>> limits for me such as 32MB but not at my default of 64MB.
>>>
g
>>> on YouTube videos when switching to HD or jumping within a video.
>>
>> the reason? foolish waves in a Uli head and stupid bug in flash plugin.
>> flash uses pthread_detach() after pthread_join() call.
>
> If that helps then it's a good idea to create a pkg-message for
> the port (Juergen Lock is CCed).
It does indeed help. I can switch between HD and standard resolution
in youtube vids, I can skip around in the vid, and I don't have to
kill the npviewer.bin process when I navigate from one Flash site to
the next. Oh, and I haven't seen a core from npviewer yet...
I've set the sysctl compat.linux32.maxssiz to 33554432 (32 MB).
It would definitely be helpful to have this in the pkg-message, or at
least documented somewhere (if it's not already -- this is the first
I've heard of it).
-Brandon
Juergen Lock
> Chagin Dmitry <dch...@freebsd.org> writes:
> > On Sun, Jun 28, 2009 at 12:39:09PM -0500, Sean C. Farley wrote:
> >> On Sun, 28 Jun 2009, Chagin Dmitry wrote:
> >>
> >> > On Sun, Jun 28, 2009 at 04:29:49PM +0000, Brandon Gooch wrote:
> >>
> >> *snip*
> >>
> >> >> I have. I'm using it with about the same level of success as the
> >> >> previous versions of Flash (I need to map a couple of keys to run
> >> >> `pkill npviewer.bin`).
> >>
> >> I also have a key mapping to killall npviewer.bin.
> >>
> >> >
> >> > for i386 try: limit stacksize to 4mb or set unlimited.
> >>
> >>
> >
> > the reason? foolish waves in a Uli head and stupid bug in flash plugin.
> > flash uses pthread_detach() after pthread_join() call.
>
.oO(Why does that remind me again of
http://developers.slashdot.org/comments.pl?sid=1063323&cid=26128419
?)
> If that helps then it's a good idea to create a pkg-message for
> the port (Juergen Lock is CCed).
Well i386 doesn't seem to have a sysctl for linux stacksize, can
ulimit be used for this too? Because I can't seem to reproduce this
problem on an i386 20090605 vbox head guest with the new ports, suddenly
flash behaves even when I click the youtube `watch in hd' button, even
multiple times... (On 7-stable amd64 with f8 the sysctl does help tho.)
Oh and if ulimit does indeed work for the linuxulator maybe
nspluginwrapper should be patched instead? (Or at least on i386?)
Wondering...
Juergen
Juergen Lock
Index: Mk/bsd.linux-apps.mk
@@ -70,7 +70,8 @@
_LINUX_APPS_ALL+=
# 2.6.16 components
-_LINUX_26_APPS= libidn libssh2 nspr nss sqlite3 tcl84 tk84
+_LINUX_26_APPS= cyrus-sasl2 libidn libssh2 nspr nss openldap \
+ sqlite3 tcl84 tk84
_LINUX_APPS_ALL+= ${_LINUX_26_APPS}
@@ -137,6 +138,11 @@
curl_DETECT= ${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl
+# no cyrus-sasl2_FILE, cyrus-sasl2_f8_FILE
+cyrus-sasl2_f10_FILE= ${LINUXBASE}/usr/lib/libsasl2.so.2.0.22
+cyrus-sasl2_DETECT= ${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+cyrus-sasl2_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-cyrus-sasl2
+
dri_FILE= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1
dri_f8_FILE= ${LINUXBASE}/usr/lib/libGL.so.1
dri_f10_FILE= ${LINUXBASE}/usr/lib/libGL.so.1.2
@@ -307,6 +313,11 @@
mikmod_DETECT= ${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
mikmod_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod
+# no openldap_FILE, openldap_f8_FILE
+openldap_f10_FILE= ${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0
+openldap_DETECT= ${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+openldap_PORT= ${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-openldap
+
openmotif_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
openmotif_f8_FILE= ${LINUXBASE}/usr/lib/libXm.so.4.0.2
openmotif_f10_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
# This is a shell archive. Save it in a file, remove anything before
X.if defined(PACKAGE_BUILDING)
XSRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}.src.rpm
XALWAYS_KEEP_DISTFILES= YES
X.endif
X
XMAINTAINER= emul...@FreeBSD.org
XCOMMENT= Lightweight Directory Access Protocol libraries (Linux Fedora 10)
X
X#CONFLICTS=
X
XUSE_LINUX_RPM= yes
XLINUX_DIST_VER= 10
XRPMVERSION= 1.fc10
XUSE_LDCONFIG= yes
XDESCR= ${.CURDIR}/../openldap24-server/pkg-descr
X
XPLIST_DIRS= etc/openldap/cacerts etc/openldap
XPLIST_FILES= etc/openldap/ldap.conf usr/lib/liblber-2.4.so.2 usr/lib/liblber-2.4.so.2.2.0 usr/lib/libldap-2.4.so.2 usr/lib/libldap-2.4.so.2.2.0 usr/lib/libldap_r-2.4.so.2 usr/lib/libldap_r-2.4.so.2.2.0
XDOCSDIR= usr/share/doc/${PORTNAME}-${PORTVERSION}
XPORTDOCS= ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
XMANPREFIX= ${PREFIX}/usr/share
XMAN5= ldap.conf.5 ldif.5
XMANCOMPRESSED= yes
X
X.include <bsd.port.mk>
17a12d65b66950d2cbc504ac86a37255
echo x - net/linux-f10-openldap/distinfo.i386
sed 's/^X//' >net/linux-f10-openldap/distinfo.i386 << 'f422178bbd4668750265f4e584e91c0e'
XMD5 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = e3ea12058a8cdc54d6f270c802c92a00
XSHA256 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 2a71dcfdbfb1dc9b4e056c951518474d5958147c033f3584dc06e784fd67d567
XSIZE (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 323504
f422178bbd4668750265f4e584e91c0e
echo c - security/linux-f10-cyrus-sasl2/
mkdir -p security/linux-f10-cyrus-sasl2/ > /dev/null 2>&1
echo x - security/linux-f10-cyrus-sasl2/Makefile
sed 's/^X//' >security/linux-f10-cyrus-sasl2/Makefile << '4fc58bcf97a8889077c61da23cb55faa'
X# New ports collection makefile for: security/linux-f10-cyrus-sasl2
X# Date created: 2009-06-07
X# Whom: peter
X#
X# $FreeBSD$
X#
X
XPORTNAME= cyrus-sasl2
XPORTVERSION= 2.1.22
XCATEGORIES= security linux
XPKGNAMEPREFIX= linux-f10-
XDISTNAME= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
X
X.if defined(PACKAGE_BUILDING)
XSRC_DISTFILES= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}.src.rpm
XALWAYS_KEEP_DISTFILES= YES
X.endif
X
XMAINTAINER= emul...@FreeBSD.org
XCOMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) (Linux Fedora 10)
X
X#CONFLICTS=
X
XUSE_LINUX_RPM= yes
XLINUX_DIST_VER= 10
XRPMVERSION= 19.fc10
XUSE_LDCONFIG= yes
XBRANDELF_FILES= usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
XDESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
X
XPLIST_DIRS= etc/sasl2 usr/lib/sasl2
XPLIST_FILES= usr/lib/libsasl2.so.2 usr/lib/libsasl2.so.2.0.22 usr/lib/sasl2/libanonymous.so usr/lib/sasl2/libanonymous.so.2 usr/lib/sasl2/libanonymous.so.2.0.22 usr/lib/sasl2/libsasldb.so usr/lib/sasl2/libsasldb.so.2 usr/lib/sasl2/libsasldb.so.2.0.22 usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
XDOCSDIR= usr/share/doc/cyrus-sasl-lib-${PORTVERSION}
XPORTDOCS= AUTHORS COPYING NEWS README advanced.html appconvert.html components.html gssapi.html index.html install.html macosx.html mechanisms.html options.html plugprog.html programming.html readme.html sysadmin.html upgrading.html windows.html
X
X.include <bsd.port.mk>
4fc58bcf97a8889077c61da23cb55faa
echo x - security/linux-f10-cyrus-sasl2/distinfo.i386
sed 's/^X//' >security/linux-f10-cyrus-sasl2/distinfo.i386 << '9c7e54bf867023e1f8fcaa16319c72f4'
XMD5 (rpm/i386/fedora/10/cyrus-sasl-lib-2.1.22-19.fc10.i386.rpm) = 5a4ee3c84ec9581723fd56b658eec994
XSHA256 (rpm/i386/fedora/10/cyrus-sasl-lib-2.1.22-19.fc10.i386.rpm) = ae8da4ee07615519c657ddbe3b8c128a2e81f00a4db0da17b7369dabe03ed6d2
XSIZE (rpm/i386/fedora/10/cyrus-sasl-lib-2.1.22-19.fc10.i386.rpm) = 145305
9c7e54bf867023e1f8fcaa16319c72f4
echo c - www/linux-f10-flashplugin10/
mkdir -p www/linux-f10-flashplugin10/ > /dev/null 2>&1
echo x - www/linux-f10-flashplugin10/Makefile
sed 's/^X//' >www/linux-f10-flashplugin10/Makefile << '5455d901d257b50d731e64397ea6df2f'
X# New ports collection makefile for: www/linux-f10-flashplugin10
X# Date created: 2009-06-26
X# Whom: bsam
X# Based on: www/linux-f8-flashplugin10 by nox@
X#
X# $FreeBSD$
X#
X
_______________________________________________
Juergen Lock
> Juergen Lock <n...@jelal.kn-bremen.de> writes:
>
> > @@ -70,7 +70,8 @@
> > _LINUX_APPS_ALL+=
> >
> > # 2.6.16 components
> > -_LINUX_26_APPS= libidn libssh2 nspr nss sqlite3 tcl84 tk84
> > +_LINUX_26_APPS= cyrus-sasl2 libidn libssh2 nspr nss openldap \
> > + sqlite3 tcl84 tk84
> >
> > _LINUX_APPS_ALL+= ${_LINUX_26_APPS}
> >
> > @@ -137,6 +138,11 @@
> > curl_DETECT= ${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> > curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl
>
> -----
> . endif
> -----
>
> Also apropriate changes should go to ftp/linux-f10-curl port.
>
> Well, those <.if, .endif> actually are not needed as bsd.linux-rpm.mk
> should itself take care of the case. If it doesn't, please tell me.
>
Ah, then a bunch of other ports can be changed too... (I guess Peter
just went by existing examples :)
> > X
> > XMAINTAINER= emul...@FreeBSD.org
> > XCOMMENT= Lightweight Directory Access Protocol libraries (Linux Fedora 10)
> > X
> > X#CONFLICTS=
> > X
> > XUSE_LINUX_RPM= yes
> > XLINUX_DIST_VER= 10
> > XRPMVERSION= 1.fc10
> > XUSE_LDCONFIG= yes
> > XDESCR= ${.CURDIR}/../openldap24-server/pkg-descr
> > X
> > XPLIST_DIRS= etc/openldap/cacerts etc/openldap
>
> I'd say only etc/openldap is needed (see below).
>
> > XPLIST_FILES= etc/openldap/ldap.conf usr/lib/liblber-2.4.so.2 usr/lib/liblber-2.4.so.2.2.0 usr/lib/libldap-2.4.so.2 usr/lib/libldap-2.4.so.2.2.0 usr/lib/libldap_r-2.4.so.2 usr/lib/libldap_r-2.4.so.2.2.0
> > XDOCSDIR= usr/share/doc/${PORTNAME}-${PORTVERSION}
> > XPORTDOCS= ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
> > XMANPREFIX= ${PREFIX}/usr/share
> > XMAN5= ldap.conf.5 ldif.5
> > XMANCOMPRESSED= yes
>
> At my port's propotype I have this:
> -----
> # do not install any openldap configuration directories/files
> post-extract:
> ${RM} -rf ${WRKSRC}/etc
>
> # use a native openldap configuration directories/files
> post-install:
> ${LN} -sf ${LOCALBASE}/etc/openldap ${PREFIX}/etc
> -----
>
> This should work for managing the port via ports system but not with
> packages.
>
Good idea, but actually the post-install target isn't really needed
since the linuxolator /compat/linux search magic should already dtrt
here. (I.e. if the dir doesn't exits it should fall back to the one
outside of /compat/linux.)
> > X
> > X.include <bsd.port.mk>
> > 17a12d65b66950d2cbc504ac86a37255
> > echo x - net/linux-f10-openldap/distinfo.i386
> > sed 's/^X//' >net/linux-f10-openldap/distinfo.i386 << 'f422178bbd4668750265f4e584e91c0e'
> > XMD5 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = e3ea12058a8cdc54d6f270c802c92a00
> > XSHA256 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 2a71dcfdbfb1dc9b4e056c951518474d5958147c033f3584dc06e784fd67d567
> > XSIZE (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 323504
>
> The following commands would do the right thing (no src distinfo for
> now):
> -----
> % cd <the port directory>
> % sudo make fetch PACKAGE_BUILDING=YES
> % sudo make makesum PACKAGE_BUILDING=YES
> -----
>
Done. (Actually makesum depends on fetch :)
> > f422178bbd4668750265f4e584e91c0e
> > echo c - security/linux-f10-cyrus-sasl2/
> > mkdir -p security/linux-f10-cyrus-sasl2/ > /dev/null 2>&1
> > echo x - security/linux-f10-cyrus-sasl2/Makefile
> > sed 's/^X//' >security/linux-f10-cyrus-sasl2/Makefile << '4fc58bcf97a8889077c61da23cb55faa'
> > X# New ports collection makefile for: security/linux-f10-cyrus-sasl2
> > X# Date created: 2009-06-07
> > X# Whom: peter
> > X#
> > X# $FreeBSD$
> > X#
> > X
> > XPORTNAME= cyrus-sasl2
> > XPORTVERSION= 2.1.22
> > XCATEGORIES= security linux
> > XPKGNAMEPREFIX= linux-f10-
> > XDISTNAME= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
> > X
> > X.if defined(PACKAGE_BUILDING)
> > XSRC_DISTFILES= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}.src.rpm
> > XALWAYS_KEEP_DISTFILES= YES
> > X.endif
>
> This is not right. I propose to add (somewhere further) instead
> of the last four lines:
> -----
> SRC_DISTFILES=cyrus-sasl-${PORTVERSION}-${RPMVERSION}.src.rpm
> -----
>
Done.
> The same comment about distinfo as for net/linux-f10-openldap.
>
Yup.
> > echo c - www/linux-f10-flashplugin10/
> > mkdir -p www/linux-f10-flashplugin10/ > /dev/null 2>&1
> > echo x - www/linux-f10-flashplugin10/Makefile
> > sed 's/^X//' >www/linux-f10-flashplugin10/Makefile << '5455d901d257b50d731e64397ea6df2f'
> > X# New ports collection makefile for: www/linux-f10-flashplugin10
>
> This port should be probably first repocopied from
> www/linux-f8-flashplugin10 and then committed.
>
True... I'll do the PR.
> There may be something more, but I don't see it right now. Thanks for
> all involved! It's a good team work.
New patch and shar below:
Index: Mk/bsd.linux-apps.mk
@@ -70,7 +70,8 @@
_LINUX_APPS_ALL+=
# 2.6.16 components
-_LINUX_26_APPS= libidn libssh2 nspr nss sqlite3 tcl84 tk84
+_LINUX_26_APPS= cyrus-sasl2 libidn libssh2 nspr nss openldap \
+ sqlite3 tcl84 tk84
_LINUX_APPS_ALL+= ${_LINUX_26_APPS}
@@ -136,6 +137,14 @@
curl_f10_FILE= ${LINUXBASE}/usr/lib/libcurl.so.4.1.1
curl_DETECT= ${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl
+. if ${LINUX_DIST_SUFFIX} == "-f10"
+curl_DEPENDS= cyrus-sasl2 openldap
+. endif
+
+# no cyrus-sasl2_FILE, cyrus-sasl2_f8_FILE
+cyrus-sasl2_f10_FILE= ${LINUXBASE}/usr/lib/libsasl2.so.2.0.22
+cyrus-sasl2_DETECT= ${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+cyrus-sasl2_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-cyrus-sasl2
dri_FILE= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1
dri_f8_FILE= ${LINUXBASE}/usr/lib/libGL.so.1
@@ -307,6 +316,11 @@
mikmod_DETECT= ${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
mikmod_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod
+# no openldap_FILE, openldap_f8_FILE
+openldap_f10_FILE= ${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0
+openldap_DETECT= ${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
+openldap_PORT= ${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-openldap
+
openmotif_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
openmotif_f8_FILE= ${LINUXBASE}/usr/lib/libXm.so.4.0.2
openmotif_f10_FILE= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
Index: ftp/linux-f10-curl/Makefile
@@ -24,6 +24,7 @@
CONFLICTS= linux-curl-[0-9]* linux-f8-curl-[0-9]*
USE_LINUX_RPM= yes
+USE_LINUX_APPS= cyrus-sasl2 openldap
LINUX_DIST_VER= 10
RPMVERSION= 5.fc10
USE_LDCONFIG= yes
# This is a shell archive. Save it in a file, remove anything before
XSRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}.src.rpm
X
XMAINTAINER= emul...@FreeBSD.org
XCOMMENT= Lightweight Directory Access Protocol libraries (Linux Fedora 10)
X
X#CONFLICTS=
X
XUSE_LINUX_RPM= yes
XLINUX_DIST_VER= 10
XRPMVERSION= 1.fc10
XUSE_LDCONFIG= yes
XDESCR= ${.CURDIR}/../openldap24-server/pkg-descr
X
XPLIST_FILES= etc/openldap/ldap.conf usr/lib/liblber-2.4.so.2 usr/lib/liblber-2.4.so.2.2.0 usr/lib/libldap-2.4.so.2 usr/lib/libldap-2.4.so.2.2.0 usr/lib/libldap_r-2.4.so.2 usr/lib/libldap_r-2.4.so.2.2.0
XDOCSDIR= usr/share/doc/${PORTNAME}-${PORTVERSION}
XPORTDOCS= ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
XMANPREFIX= ${PREFIX}/usr/share
XMAN5= ldap.conf.5 ldif.5
XMANCOMPRESSED= yes
X
X# do not install any openldap configuration directories/files
Xpost-extract:
X ${RM} -rf ${WRKSRC}/etc
X
X.include <bsd.port.mk>
17a12d65b66950d2cbc504ac86a37255
echo x - net/linux-f10-openldap/distinfo.i386
sed 's/^X//' >net/linux-f10-openldap/distinfo.i386 << 'f422178bbd4668750265f4e584e91c0e'
XMD5 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = e3ea12058a8cdc54d6f270c802c92a00
XSHA256 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 2a71dcfdbfb1dc9b4e056c951518474d5958147c033f3584dc06e784fd67d567
XSIZE (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 323504
XMD5 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.src.rpm) = f28ec039fad4f81abc6df09c5542bdaa
XSHA256 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.src.rpm) = 84bff280805bf046849d96ba80bd6b0d0da895da07f0e6d6efde2667b4ff1e1c
XSIZE (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.src.rpm) = 16905121
f422178bbd4668750265f4e584e91c0e
echo c - security/linux-f10-cyrus-sasl2/
mkdir -p security/linux-f10-cyrus-sasl2/ > /dev/null 2>&1
echo x - security/linux-f10-cyrus-sasl2/Makefile
sed 's/^X//' >security/linux-f10-cyrus-sasl2/Makefile << '4fc58bcf97a8889077c61da23cb55faa'
X# New ports collection makefile for: security/linux-f10-cyrus-sasl2
X# Date created: 2009-06-07
X# Whom: peter
X#
X# $FreeBSD$
X#
X
XPORTNAME= cyrus-sasl2
XPORTVERSION= 2.1.22
XCATEGORIES= security linux
XPKGNAMEPREFIX= linux-f10-
XDISTNAME= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
X
XSRC_DISTFILES= cyrus-sasl-${PORTVERSION}-${RPMVERSION}.src.rpm
XMD5 (rpm/i386/fedora/10/cyrus-sasl-2.1.22-19.fc10.src.rpm) = f66997139328e0446b1635b4c59c5cd4
XSHA256 (rpm/i386/fedora/10/cyrus-sasl-2.1.22-19.fc10.src.rpm) = 70f087f10f7a6c62a30befadef9904c03543aa20ae890889b2a08a04382e6963
XSIZE (rpm/i386/fedora/10/cyrus-sasl-2.1.22-19.fc10.src.rpm) = 1661687
Juergen Lock
> not needed because SRC_DISTFILES=${DISTNAME}.src.rpm. This is true for
> net/linux-f10-openldap. But for security/linux-f10-cyrus-sasl2 it is not
> true and SRC_DISTFILES should be defined at Makefile.
>
> The linuxulator magic will work if a linux program search not
> only at /etc/openldap but also at /usr/local/etc/openldap.
> I guess it won't happen.
>
Ooops, indeed, I should have read your patch more closely...
> The linuxulator do a search for a /some/path/file at:
> . /compat/linux/some/path/file, if not found
> . /some/path/file, if not found
> . /compat/linux/some/path/file.
>
> Anyway, we are talking here about correct linux openldap work.
> But for the sake of linux-f10-flashplugin10 imho it's not
> critical.
>
Anyway, fixed now.
> [...]
> > Index: ftp/linux-f10-curl/Makefile
>
> Seems like PORTREVISION should be bumped.
>
> [...]
I guess you are right.
New patch and shar:
--- ftp/linux-f10-curl/Makefile.1 2009-06-27 22:55:17.000000000 +0200
+++ ftp/linux-f10-curl/Makefile 2009-06-28 10:14:22.000000000 +0200
@@ -7,7 +7,7 @@
PORTNAME= curl
PORTVERSION= 7.19.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp linux
PKGNAMEPREFIX= linux-f10-
DISTFILES= curl-${PORTVERSION}-${RPMVERSION}.i386.rpm \
XMAINTAINER= emul...@FreeBSD.org
XCOMMENT= Lightweight Directory Access Protocol libraries (Linux Fedora 10)
X
X#CONFLICTS=
X
XUSE_LINUX_RPM= yes
XLINUX_DIST_VER= 10
XRPMVERSION= 1.fc10
XUSE_LDCONFIG= yes
XDESCR= ${.CURDIR}/../openldap24-server/pkg-descr
X
XPLIST_FILES= usr/lib/liblber-2.4.so.2 usr/lib/liblber-2.4.so.2.2.0 usr/lib/libldap-2.4.so.2 usr/lib/libldap-2.4.so.2.2.0 usr/lib/libldap_r-2.4.so.2 usr/lib/libldap_r-2.4.so.2.2.0
XDOCSDIR= usr/share/doc/${PORTNAME}-${PORTVERSION}
XPORTDOCS= ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
XMANPREFIX= ${PREFIX}/usr/share
XMAN5= ldap.conf.5 ldif.5
XMANCOMPRESSED= yes
X
X# do not install any openldap configuration directories/files
Xpost-extract:
X ${RM} -rf ${WRKSRC}/etc
X
X# use a native openldap configuration directories/files
Xpost-install:
X ${LN} -sf ${LOCALBASE}/etc/openldap ${PREFIX}/etc
Renato Botelho
e:
> On Sun, Jun 28, 2009 at 04:40:20PM +0400, Boris Samorodov wrote:
>> Juergen Lock <n...@jelal.kn-bremen.de> writes:
>>
>>
>> No more comments from me, thanks!
>
Working fine here. 8.0-current i386
--=20
Renato Botelho