Re: CVS commit: pkgsrc/devel/nss

To: wiz%netbsd.org@localhost, pkgsrc-changes%NetBSD.org@localhost
Subject: Re: CVS commit: pkgsrc/devel/nss
From: Ryo ONODERA <ryo%tetera.org@localhost>
Date: Sat, 10 Apr 2021 10:14:46 +0900
Hi,

Ryo ONODERA <ryo%tetera.org@localhost> writes:

> Hi,
>
> Ryo ONODERA <ryo%tetera.org@localhost> writes:
>
>> Hi,
>>
>> Maybe with this change, NSD_DigestUpdate() in /usr/pkg/lib/nss/libsoftokn3.so
>> calls MD5_Update() in /usr/lib/libcrypto.so.14 from OpenSSL in
>> pkgsrc/misc/libreoffice.
>> It should call MD5_Update() from pkgsrc/devel/nss.
>>
>> I will investigate deeper for misc/libreoffice.
>> Something goes wrong...
>
> Any binary files of misc/libreoffice does not link to libsoftkn3.so
> or libfreebl.so directly in my case.
> However libsoftokn3.so misuses MD5_Update from OpenSSL.
>
> I know your discussion on dev-tech-crypto%mozilla.org@localhost mailing list.
> However some more consideration is required to misc/libreoffice.

I will convert misc/libreoffice not to use nss.
misc/libreoffice support OpenSSL TLS backend and it may be good
workaround.

> Thank you.
>
>> Here is backtrace of misc/libreoffice crash (when export a document as PDF):
>>
>> Thread 1 "" received signal SIGSEGV, Segmentation fault.
>> 0x0000733e8cd787a4 in memcpy () from /usr/lib/libc.so.12
>> (gdb) bt
>> #0  0x0000733e8cd787a4 in memcpy () from /usr/lib/libc.so.12
>> #1  0x0000733e7f5c9afe in MD5_Update () from /usr/lib/libcrypto.so.14
>> #2  0x0000733e41e24aa3 in NSC_DigestUpdate ()
>>    from /usr/pkg/lib/nss/libsoftokn3.so
>> #3  0x0000733e7d45c82c in PK11_DigestOp () from /usr/pkg/lib/nss/libnss3.so
>> #4  0x0000733e7d44d731 in HASH_Update () from /usr/pkg/lib/nss/libnss3.so
>> #5  0x0000733e831dfd79 in vcl::PDFWriterImpl::computeDocumentIdentifier(std::vector<unsigned char, std::allocator<unsigned char> >&, vcl::PDFWriter::PDFDocInfo const&, rtl::OString const&, 
>> rtl::OString&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libvcllo.so
>> #6  0x0000733e831e015d in vcl::PDFWriterImpl::setupDocInfo() ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libvcllo.so
>> #7  0x0000733e8320161c in vcl::PDFWriterImpl::PDFWriterImpl(vcl::PDFWriter::PDFWriterContext const&, com::sun::star::uno::Reference<com::sun::star::beans::XMaterialHolder> const&, vcl::PDFWriter&) 
>> ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libvcllo.so
>> #8  0x0000733e831d4d81 in vcl::PDFWriter::PDFWriter(vcl::PDFWriter::PDFWriterContext const&, com::sun::star::uno::Reference<com::sun::star::beans::XMaterialHolder> const&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libvcllo.so
>> #9  0x0000733e4221d224 in PDFExport::Export(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/../program/libpdffilterlo.so
>> #10 0x0000733e4222206d in PDFFilter::implExport(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/../program/libpdffilterlo.so
>> #11 0x0000733e4222321e in PDFFilter::filter(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/../program/libpdffilterlo.so
>> #12 0x0000733e86caa36e in SfxObjectShell::ExportTo(SfxMedium&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #13 0x0000733e86cb12f3 in SfxObjectShell::SaveTo_Impl(SfxMedium&, SfxItemSet const*) () from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #14 0x0000733e86cb4348 in SfxObjectShell::PreDoSaveAs_Impl(rtl::OUString const&, rtl::OUString const&, SfxItemSet const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> 
>> const&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> --Type <RET> for more, q to quit, c to continue without paging--
>> #15 0x0000733e86cb574d in SfxObjectShell::CommonSaveAs_Impl(INetURLObject const&, rtl::OUString const&, SfxItemSet&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #16 0x0000733e86c9f4ac in SfxObjectShell::APISaveAs_Impl(rtl::OUString const&, SfxItemSet&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #17 0x0000733e86cdb65d in SfxBaseModel::impl_store(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, bool) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #18 0x0000733e86cdca32 in SfxBaseModel::storeToURL(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #19 0x0000733e86c8c6cf in SfxStoringHelper::GUIStoreModel(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, rtl::OUString const&, 
>> com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, bool, SignatureState) () from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #20 0x0000733e86ca062a in SfxObjectShell::ExecFile_Impl(SfxRequest&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #21 0x0000733e86bae459 in SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #22 0x0000733e86bb3ad9 in SfxDispatcher::Execute_(SfxShell&, SfxSlot const&, SfxRequest&, SfxCallMode) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #23 0x0000733e86bab72a in SfxBindings::Execute_Impl(SfxRequest&, SfxSlot const*, SfxShell*) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #24 0x0000733e86bdd456 in SfxDispatchController_Impl::dispatch(com::sun::star::util::URL const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&, 
>> com::sun::star::uno::Reference<com::sun::star::frame::XDispatchResultListener> const&) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #25 0x0000733e86bdda2f in SfxOfficeDispatch::dispatch(com::sun::star::util::URL const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) () from 
>> /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsfxlo.so
>> #26 0x0000733e8839e1c1 in framework::GenericToolbarController::ExecuteHdl_Impl(framework::GenericToolbarController*, void*) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libfwklo.so
>> --Type <RET> for more, q to quit, c to continue without paging--
>> #27 0x0000733e8307c41f in ImplWindowFrameProc(vcl::Window*, SalEvent, void const*) () from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libvcllo.so
>> #28 0x0000733e8329fcac in SalUserEventList::DispatchUserEvents(bool) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libvcllo.so
>> #29 0x0000733e690d1b62 in call_userEventFn ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libvclplug_gtk3lo.so
>> #30 0x0000733e6ee4a9ca in g_main_context_dispatch ()
>>    from /usr/pkg/lib/libglib-2.0.so.0
>> #31 0x0000733e6ee4acd8 in g_main_context_iterate.isra ()
>>    from /usr/pkg/lib/libglib-2.0.so.0
>> #32 0x0000733e6ee4ad83 in g_main_context_iteration ()
>>    from /usr/pkg/lib/libglib-2.0.so.0
>> #33 0x0000733e690d314b in GtkSalData::Yield(bool, bool) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libvclplug_gtk3lo.so
>> #34 0x0000733e832c8dc6 in ImplYield(bool, bool) ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libvcllo.so
>> #35 0x0000733e832ca957 in Application::Execute() ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libvcllo.so
>> #36 0x0000733e8d22bc8f in desktop::Desktop::Main() ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsofficeapp.so
>> #37 0x0000733e832d1cda in ImplSVMain() ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libvcllo.so
>> #38 0x0000733e8d23f84c in soffice_main ()
>>    from /usr/pkg/libreoffice-7.1.2.2/lib/libreoffice/program/libsofficeapp.so
>> #39 0x0000000000400bc6 in main ()
>>
>>
>> "Thomas Klausner" <wiz%netbsd.org@localhost> writes:
>>
>>> Module Name:        pkgsrc
>>> Committed By:       wiz
>>> Date:               Fri Apr  9 06:40:59 UTC 2021
>>>
>>> Modified Files:
>>>     pkgsrc/devel/nss: Makefile distinfo
>>>     pkgsrc/devel/nss/patches: patch-me patch-mf
>>> Removed Files:
>>>     pkgsrc/devel/nss/files: nss-config.in nss.pc.in
>>>     pkgsrc/devel/nss/patches: patch-am patch-an patch-mg patch-mj
>>>         patch-nss_lib_freebl_md5.c
>>>
>>> Log Message:
>>> nss: fix interoperability with openssl
>>>
>>> For a long time now (at least 15 years), the installed pkg-config
>>> file also linked against libsoftokn3, which is wrong according to
>>> upstream. This library is only intended to be loaded as a module.
>>>
>>> Having this library linked added symbols to the namespace that conflict
>>> with openssl symbols. This had caused problems before, and patches
>>> had been added to rename symbols to avoid this conflict.
>>>
>>> Instead, fix this correctly by not linking against libsoftokn3.
>>>
>>> Switch to using the pkg-config and nss-config files provided in the
>>> distfiles instead of pkgsrc-specific ones.
>>>
>>> Remove now unneeded symbol-renaming patches.
>>>
>>> Remove DragonFly patches while here.
>>>
>>> Bump PKGREVISION.
>>>
>>>
>>> To generate a diff of this commit:
>>> cvs rdiff -u -r1.199 -r1.200 pkgsrc/devel/nss/Makefile
>>> cvs rdiff -u -r1.124 -r1.125 pkgsrc/devel/nss/distinfo
>>> cvs rdiff -u -r1.1 -r0 pkgsrc/devel/nss/files/nss-config.in \
>>>     pkgsrc/devel/nss/files/nss.pc.in
>>> cvs rdiff -u -r1.6 -r0 pkgsrc/devel/nss/patches/patch-am \
>>>     pkgsrc/devel/nss/patches/patch-an
>>> cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/nss/patches/patch-me
>>> cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/nss/patches/patch-mf
>>> cvs rdiff -u -r1.2 -r0 pkgsrc/devel/nss/patches/patch-mg \
>>>     pkgsrc/devel/nss/patches/patch-mj
>>> cvs rdiff -u -r1.1 -r0 pkgsrc/devel/nss/patches/patch-nss_lib_freebl_md5.c
>>>
>>> Please note that diffs are not public domain; they are subject to the
>>> copyright notices on the relevant files.
>>>
>>> Modified files:
>>>
>>> Index: pkgsrc/devel/nss/Makefile
>>> diff -u pkgsrc/devel/nss/Makefile:1.199 pkgsrc/devel/nss/Makefile:1.200
>>> --- pkgsrc/devel/nss/Makefile:1.199 Tue Mar 30 16:34:05 2021
>>> +++ pkgsrc/devel/nss/Makefile       Fri Apr  9 06:40:59 2021
>>> @@ -1,7 +1,8 @@
>>> -# $NetBSD: Makefile,v 1.199 2021/03/30 16:34:05 ryoon Exp $
>>> +# $NetBSD: Makefile,v 1.200 2021/04/09 06:40:59 wiz Exp $
>>>  
>>>  DISTNAME=          nss-${NSS_RELEASE:S/.0$//}
>>>  NSS_RELEASE=               3.63.0
>>> +PKGREVISION=               1
>>>  CATEGORIES=                devel security
>>>  MASTER_SITES=              ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_DIST_DIR_VERSION:S/_0$//}_RTM/src/}
>>>  
>>> @@ -89,25 +90,34 @@ MAKE_ENV+=      NSS_ENABLE_TLS_1_3=1
>>>  CFLAGS+=   -DNSS_NO_GCC48
>>>  .endif
>>>  
>>> -NSS_MAJOR_VERSION= ${NSS_RELEASE:C/\.[0-9.]*//}
>>> -NSS_MINOR_VERSION= ${NSS_RELEASE:S/3.//:C/\.[0-9]*//}
>>> -NSS_PATCH_VERSION= ${NSS_RELEASE:C/[0-9.]*\.//}
>>> -NSS_DIST_DIR_VERSION=      ${NSS_MAJOR_VERSION}_${NSS_MINOR_VERSION}_${NSS_PATCH_VERSION}
>>> +MOD_MAJOR_VERSION= ${NSS_RELEASE:C/\.[0-9.]*//}
>>> +MOD_MINOR_VERSION= ${NSS_RELEASE:S/3.//:C/\.[0-9]*//}
>>> +MOD_PATCH_VERSION= ${NSS_RELEASE:C/[0-9.]*\.//}
>>> +NSS_DIST_DIR_VERSION=      ${MOD_MAJOR_VERSION}_${MOD_MINOR_VERSION}_${MOD_PATCH_VERSION}
>>>  
>>> +NSPR_MINIMUM_VERSION=      4.29
>>> +
>>> +PKGCONFIG_OVERRIDE=        nss.pc
>>>  
>>>  SUBST_CLASSES+=            config
>>> -SUBST_VARS.config= PREFIX
>>> -SUBST_VARS.config+=        NSS_MAJOR_VERSION
>>> -SUBST_VARS.config+=        NSS_MINOR_VERSION
>>> -SUBST_VARS.config+=        NSS_PATCH_VERSION
>>> -SUBST_VARS.config+=        COMPILER_RPATH_FLAG
>>> +# nss.pc
>>>  SUBST_SED.config+= -e "s,@PTHREAD@,${BUILDLINK_LIBS.pthread:Q},"
>>> +SUBST_SED.config+= -e "s,%prefix%,${PREFIX},"
>>> +SUBST_SED.config+= -e "s,%exec_prefix%,${PREFIX},"
>>> +SUBST_SED.config+= -e "s,%libdir%,${PREFIX}/lib/nss,"
>>> +SUBST_SED.config+= -e "s,%includedir%,${PREFIX}/include/nss,"
>>> +SUBST_SED.config+= -e "s,%NSS_VERSION%,${PKGVERSION_NOREV},"
>>> +SUBST_SED.config+= -e "s,%NSPR_VERSION%,${NSPR_MINIMUM_VERSION},"
>>> +# nss-config
>>> +SUBST_SED.config+= -e "s,@prefix@,${PREFIX},"
>>> +SUBST_VARS.config+=        MOD_MAJOR_VERSION
>>> +SUBST_VARS.config+=        MOD_MINOR_VERSION
>>> +SUBST_VARS.config+=        MOD_PATCH_VERSION
>>>  SUBST_STAGE.config=        pre-build
>>>  SUBST_MESSAGE.config=      Preparing *-config files.
>>>  SUBST_FILES.config+=       nss.pc nss-config
>>>  
>>>  INSTALLATION_DIRS= bin include/nss lib/nss lib/pkgconfig
>>> -DIST=      ${WRKSRC}/dist
>>>  
>>>  INSTALL_CMDS+=             certutil cmsutil crlutil derdump makepqg \
>>>                     mangle modutil ocspclnt oidcalc p7content p7env p7sign \
>>> @@ -117,25 +127,25 @@ INSTALL_CMDS+=                certutil cmsutil crlutil
>>>  post-extract:
>>>     find ${WRKSRC} -type f | xargs ${CHMOD} 644
>>>     find ${WRKSRC} -type d | xargs ${CHMOD} 755
>>> -   ${CP} ${FILESDIR}/nss.pc.in ${WRKSRC}/nss.pc
>>> -   ${CP} ${FILESDIR}/nss-config.in ${WRKSRC}/nss-config
>>> +   ${CP} ${WRKSRC}/nss/pkg/pkg-config/nss.pc.in ${WRKSRC}/nss.pc
>>> +   ${CP} ${WRKSRC}/nss/pkg/pkg-config/nss-config.in ${WRKSRC}/nss-config
>>>  
>>>  do-install:
>>> -   (cd ${DIST}/public/nss && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss )
>>> -   (cd ${DIST}/*_OPT.OBJ/lib && \
>>> +   (cd ${WRKSRC}/dist/public/nss && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss )
>>> +   (cd ${WRKSRC}/dist/*_OPT.OBJ/lib && \
>>>             pax -Lrw *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
>>> -   ${INSTALL_DATA} ${DIST}/*_OPT.OBJ/lib/libcrmf.a \
>>> +   ${INSTALL_DATA} ${WRKSRC}/dist/*_OPT.OBJ/lib/libcrmf.a \
>>>             ${DESTDIR}${PREFIX}/lib/nss/
>>>     ${INSTALL_DATA} ${WRKSRC}/nss.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc
>>>     ${INSTALL_SCRIPT} ${WRKSRC}/nss-config ${DESTDIR}${PREFIX}/bin/nss-config
>>>  .for cmd in ${INSTALL_CMDS}
>>> -   ${INSTALL_PROGRAM} ${DIST}/*_OPT.OBJ/bin/${cmd} ${DESTDIR}${PREFIX}/bin
>>> +   ${INSTALL_PROGRAM} ${WRKSRC}/dist/*_OPT.OBJ/bin/${cmd} ${DESTDIR}${PREFIX}/bin
>>>  .endfor
>>>  
>>>  # For consistency of libxul.so link in www/firefox.
>>>  BUILDLINK_API_DEPENDS.sqlite3+=    sqlite3>=3.8.4.2
>>>  .include "../../databases/sqlite3/buildlink3.mk"
>>> -BUILDLINK_API_DEPENDS.nspr+=       nspr>=4.29
>>> +BUILDLINK_API_DEPENDS.nspr+=       nspr>=${NSPR_MINIMUM_VERSION}
>>>  .include "../../devel/nspr/buildlink3.mk"
>>>  .include "../../devel/zlib/buildlink3.mk"
>>>  .include "../../mk/pthread.buildlink3.mk"
>>>
>>> Index: pkgsrc/devel/nss/distinfo
>>> diff -u pkgsrc/devel/nss/distinfo:1.124 pkgsrc/devel/nss/distinfo:1.125
>>> --- pkgsrc/devel/nss/distinfo:1.124 Tue Mar 30 16:34:05 2021
>>> +++ pkgsrc/devel/nss/distinfo       Fri Apr  9 06:40:59 2021
>>> @@ -1,16 +1,12 @@
>>> -$NetBSD: distinfo,v 1.124 2021/03/30 16:34:05 ryoon Exp $
>>> +$NetBSD: distinfo,v 1.125 2021/04/09 06:40:59 wiz Exp $
>>>  
>>>  SHA1 (nss-3.63.tar.gz) = ecdf1352cb35d43a2bb4e276ece100c30a26a0ec
>>>  RMD160 (nss-3.63.tar.gz) = f2c4c73360c3370276b5cb468139c748ed590b8f
>>>  SHA512 (nss-3.63.tar.gz) = 2f1f75dce7fd049453cbcf53263a3d9d4d9e62ad2cc2fef4dd0d5645fe14dad4ce47ed64aae507a09214d7fccbe83c142844121f55b44783e5a1bcfe24ea671c
>>>  Size (nss-3.63.tar.gz) = 82167087 bytes
>>> -SHA1 (patch-am) = fea682bf03bc8b645049f93ed58554ca45f47aca
>>> -SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69
>>>  SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1
>>> -SHA1 (patch-me) = 3b23fb15a1a22204604ebe64345bb30734a131ba
>>> -SHA1 (patch-mf) = 534fe5f711f60dadc3432bc805a6153535f11709
>>> -SHA1 (patch-mg) = 3c878548c98bdea559a3e653e63e0ed22a2a8834
>>> -SHA1 (patch-mj) = 08ca1a37afce99e0292a20348fc6855547f44e8a
>>> +SHA1 (patch-me) = ffb5f119764c158c0bd789bd18fc77c61f2e9d2b
>>> +SHA1 (patch-mf) = 40e58385fb6f944f463bf00b9aad72bc4ea229d0
>>>  SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
>>>  SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6
>>>  SHA1 (patch-nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af
>>> @@ -19,7 +15,6 @@ SHA1 (patch-nss_coreconf_OpenBSD.mk) = 1
>>>  SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
>>>  SHA1 (patch-nss_lib_freebl_aes-armv8.c) = aa698f61dd3d66ba707a9b5425bc15d057244ad7
>>>  SHA1 (patch-nss_lib_freebl_gcm-aarch64.c) = 311cfe7ca58e91285052d0ca27bd2df3f325071b
>>> -SHA1 (patch-nss_lib_freebl_md5.c) = 5cbec40695e296f0713895fb85cd37f6df76b85b
>>>  SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb
>>>  SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071
>>>  SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7
>>>
>>> Index: pkgsrc/devel/nss/patches/patch-me
>>> diff -u pkgsrc/devel/nss/patches/patch-me:1.8 pkgsrc/devel/nss/patches/patch-me:1.9
>>> --- pkgsrc/devel/nss/patches/patch-me:1.8   Sun Apr 12 15:13:34 2020
>>> +++ pkgsrc/devel/nss/patches/patch-me       Fri Apr  9 06:40:59 2021
>>> @@ -1,18 +1,9 @@
>>> -$NetBSD: patch-me,v 1.8 2020/04/12 15:13:34 tnn Exp $
>>> +$NetBSD: patch-me,v 1.9 2021/04/09 06:40:59 wiz Exp $
>>>  
>>> -Add DragonFly support.
>>> +clang for SunOS(?)
>>>  
>>>  --- nss/lib/freebl/Makefile.orig   2020-03-06 18:44:20.000000000 +0000
>>>  +++ nss/lib/freebl/Makefile
>>> -@@ -320,7 +320,7 @@ endif
>>> - # to bind the blapi function references in FREEBLVector vector
>>> - # (ldvector.c) to the blapi functions defined in the freebl
>>> - # shared libraries.
>>> --ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
>>> -+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
>>> -     MKSHLIB += -Wl,-Bsymbolic
>>> - endif
>>> - 
>>>  @@ -472,7 +472,11 @@ else
>>>       ifdef NS_USE_GCC
>>>     LD = gcc
>>>
>>> Index: pkgsrc/devel/nss/patches/patch-mf
>>> diff -u pkgsrc/devel/nss/patches/patch-mf:1.5 pkgsrc/devel/nss/patches/patch-mf:1.6
>>> --- pkgsrc/devel/nss/patches/patch-mf:1.5   Sun Apr 17 19:27:10 2016
>>> +++ pkgsrc/devel/nss/patches/patch-mf       Fri Apr  9 06:40:59 2021
>>> @@ -1,19 +1,9 @@
>>> -$NetBSD: patch-mf,v 1.5 2016/04/17 19:27:10 ryoon Exp $
>>> +$NetBSD: patch-mf,v 1.6 2021/04/09 06:40:59 wiz Exp $
>>>  
>>> -Add DragonFly support.
>>>  Make sure nss libraries have a run path defined.
>>>  
>>>  --- nss/coreconf/config.mk.orig    2016-02-26 20:51:11.000000000 +0000
>>>  +++ nss/coreconf/config.mk
>>> -@@ -31,7 +31,7 @@ endif
>>> - #######################################################################
>>> - 
>>> - TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
>>> --              AIX RISCOS WINNT WIN95 Linux Android
>>> -+              AIX RISCOS WINNT WIN95 Linux Android DragonFly
>>> - 
>>> - ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
>>> - include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
>>>  @@ -187,6 +187,7 @@ endif
>>>   DEFINES += -DUSE_UTIL_DIRECTLY
>>>   USE_UTIL_DIRECTLY = 1
>>>
>>
>> -- 
>> Ryo ONODERA // ryo%tetera.org@localhost
>> PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3
>
> -- 
> Ryo ONODERA // ryo%tetera.org@localhost
> PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3

-- 
Ryo ONODERA // ryo%tetera.org@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3
Follow-Ups:
- Re: CVS commit: pkgsrc/devel/nss
  - From: Ryo ONODERA
References:
- CVS commit: pkgsrc/devel/nss
  - From: Thomas Klausner
- Re: CVS commit: pkgsrc/devel/nss
  - From: Ryo ONODERA
- Re: CVS commit: pkgsrc/devel/nss
  - From: Ryo ONODERA
Prev by Date: Re: CVS commit: pkgsrc/devel/nss
Next by Date: CVS commit: pkgsrc/security/validns
Previous by Thread: Re: CVS commit: pkgsrc/devel/nss
Next by Thread: Re: CVS commit: pkgsrc/devel/nss
Indexes:
Home | Main Index | Thread Index | Old Index