From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from conssluserg-06.nifty.com (conssluserg-06.nifty.com [210.131.2.91]) by sourceware.org (Postfix) with ESMTPS id 239B33858C78 for ; Fri, 17 Feb 2023 08:50:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 239B33858C78 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=nifty.ne.jp Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=nifty.ne.jp Received: from HP-Z230 (aj135041.dynamic.ppp.asahi-net.or.jp [220.150.135.41]) (authenticated) by conssluserg-06.nifty.com with ESMTP id 31H8nxQN014144; Fri, 17 Feb 2023 17:50:00 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-06.nifty.com 31H8nxQN014144 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.ne.jp; s=dec2015msa; t=1676623800; bh=OXrUfUinSnbWeYSXHLDJ8YCPjttFeJcSUuNdqdaS1ig=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=ip6FCwtYrG5/j6VB3YQqsV6tXbrLBdDZBgzv2eZUFXtf+t/EyjvIxL/H86M+DqGy0 Wa1LnPyRdOaa5o+fA+xcqcSxbBUhJU/0uaGsTSfMZM+Nc95A4C2wvmwIOlJRG8z9LN uOchBIO1zIHx2EBz9Kegks1pynr3dG/+OGM90+HizbGT6QTLutLMhDrnuUIZMZDoeL ipsKYtU+AIBHRyqhTHV4qOhv1LKLGI3hJ4Jzn4sirVo0q6XTXE/8e6bZPQ5xmFj1xa Vj0G18SeGUITdiQRqtMmdRLWVjHEiPUf+K+5Q8lm98vu0jO8llva24kk+VxaFsf6mI cARTfpwMt6feA== X-Nifty-SrcIP: [220.150.135.41] Date: Fri, 17 Feb 2023 17:49:59 +0900 From: Takashi Yano To: "cygwin-apps@cygwin.com" Cc: Jon Turney Subject: Re: [ITP] openh264 (2.3.1) Message-Id: <20230217174959.c4172f9b903763dc58df4320@nifty.ne.jp> In-Reply-To: References: <20230205173745.cf6aa7153ce8eae1dfd52c4c@nifty.ne.jp> <61e8a80b73a2d431afa338bd274dac17c5c87e25.camel@cygwin.com> <20230206142523.23a3b4b02cf8a8c5ef54b9f0@nifty.ne.jp> <20230210140531.673c73c9e3c2f8682418e803@nifty.ne.jp> <20230210141850.bfb1fbe60f09ef83d7407374@nifty.ne.jp> <20230210142534.18683ad2cd9e61e21d8fa8ab@nifty.ne.jp> <0e72ab79-fa2b-71fb-c453-3e29590ea7e4@dronecode.org.uk> <846e51c3-f96b-348a-a6aa-2b12bb74376d@Shaw.ca> <20230214181138.b1ecbd47e2ed919ed49cc714@nifty.ne.jp> <87cz6cwlv6.fsf@Otto.invalid> <20230214212801.83ead05c9df51b281e26baf4@nifty.ne.jp> <878rh0w66r.fsf@Otto.invalid> <20230215062152.474ad26d8c3b4a9bd0d2bb82@nifty.ne.jp> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.30; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart=_Fri__17_Feb_2023_17_49_59_+0900_M+r6Wd=8OhBf18uz" X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This is a multi-part message in MIME format. --Multipart=_Fri__17_Feb_2023_17_49_59_+0900_M+r6Wd=8OhBf18uz Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Thu, 16 Feb 2023 19:24:24 +0000 Jon Turney wrote: > On 14/02/2023 21:21, Takashi Yano via Cygwin-apps wrote: > > On Tue, 14 Feb 2023 17:41:16 +0100 > > ASSI wrote: > >> Takashi Yano via Cygwin-apps writes: > >>> Thanks for the advice. I have revised the cygport file. > >> > >> You are getting the file and the hash from the same unprotected source. > >> I was thinking you should put the hash into the cygport file and hence > >> the postinstall script. > >> > >> Also note that the system doing the postinstall will not necessarily > >> have internet access, so you'll need to cope with errors that will > >> produce. > > > > Thanks. > > > > The new cygport file attached downloads md5hash during > > the packaging process and embeds it into postinstall > > script. Does this make sense? > > Thanks. > > So, this looks like it works, and meets the requirements. > > Is md5 the only hash available? This is not really considered "good > enough" any more. > > As a thought-experiment, consider doing it slightly differently: > > package contains: > - the headers > - a data file with the version (or maybe URL) and hash > - a script which can fetch (using above data) or remove the DLL > - postinstall and preremove scripts which invoke that script appropriately > > (I think this means the post/pre scripts can be static, and packaged via > $C, rather than written by the cygport itself) > > What do you think of that? Thanks for the advice! So, how about this one? package contains: - the headers - the data files with the version and hash - postinstall and preremove scripts which fetch (using above data) and remove the DLL -- Takashi Yano --Multipart=_Fri__17_Feb_2023_17_49_59_+0900_M+r6Wd=8OhBf18uz Content-Type: text/plain; name="openh264.cygport" Content-Disposition: attachment; filename="openh264.cygport" Content-Transfer-Encoding: 7bit NAME="openh264" VERSION=2.3.1 RELEASE=1 CATEGORY="Video" SUMMARY="H.264 codec library by Cisco" DESCRIPTION="OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC. The binary library (runtime) itself will be downloaded from http://ciscobinary.openh264.org/" HOMEPAGE="https://www.openh264.org/" LICENSE="BSD-2-Clause" ARCH="noarch" # This is noarch because it's just header files and shell scrpits. SRC_URI="${NAME}-headers-${VERSION}.tar.xz" # Make dummy source file for prep if the cleaned one is not exist. if [ ! -f ${SRC_URI} ] then mkdir ${NAME}-${VERSION} touch ${NAME}-${VERSION}/dummy tar acf ${SRC_URI} ${NAME}-${VERSION} rm -rf ${NAME}-${VERSION} fi CYGPORT_USE_UNSTABLE_API=1 src_unpack_hook() { if [ $(tar tvf ../../../${SRC_URI} | wc -l) -eq 2 ] # Source file is dummy then NV=${NAME}-${VERSION} pushd .. rm -rf ${NV} # Remove dummy source file. # Download original source file. wget https://github.com/cisco/openh264/archive/refs/tags/v${VERSION}.tar.gz tar xf v${VERSION}.tar.gz rm -f v${VERSION}.tar.gz # Make source tarball file which has only necessary header files. tar acf ../../${NAME}-headers-${VERSION}.tar.xz ${NV}/codec/api/wels/*.h # Update source directory. rm -rf ${NV} tar xf ../../${NAME}-headers-${VERSION}.tar.xz popd fi } PKG_NAMES="libopenh264 libopenh264-headers" libopenh264_CATEGORY="Video Libs" libopenh264_CONTENTS="etc/ usr/share/" libopenh264_REQUIRES="wget bzip2" libopenh264_SUMMARY="H.264 codec library runtime by Cisco" libopenh264_headers_CATEGORY="Video Devel" libopenh264_headers_CONTENTS="usr/include" libopenh264_headers_SUMMARY="H.264 codec library headers" src_compile() { : } src_install() { mkdir -p ${D}/usr/include ln -fs ${S}/codec/api/wels ${D}/usr/include/. # Get license file mkdir -p ${D}/usr/share/doc/lib${NAME} if ! wget -q http://www.openh264.org/BINARY_LICENSE.txt -O - > ${D}/usr/share/doc/lib${NAME}/BINARY_LICENSE.txt then echo "Need internet access!!!" exit 1 fi mkdir -p ${D}/etc/lib${NAME} # Make sha256 hash wget -q http://ciscobinary.openh264.org/${NAME}-${VERSION}-win64.dll.bz2 -O - | bunzip2 | sha256sum | sed "s/-$/${NAME}-${VERSION}-win64.tmp/" > ${D}/etc/lib${NAME}/${NAME}-${VERSION}-win64.dll.sha256 wget -q http://ciscobinary.openh264.org/${NAME}-${VERSION}-win32.dll.bz2 -O - | bunzip2 | sha256sum | sed "s/-$/${NAME}-${VERSION}-win32.tmp/" > ${D}/etc/lib${NAME}/${NAME}-${VERSION}-win32.dll.sha256 # Make version text echo ${VERSION} > ${D}/etc/lib${NAME}/version.txt # Install postinstall/preremove scripts mkdir -p ${D}/etc/postinstall ${D}/etc/preremove cp ${C}/lib${NAME}.postinstall ${D}/etc/postinstall/lib${NAME}.sh cp ${C}/lib${NAME}.preremove ${D}/etc/preremove/lib${NAME}.sh } --Multipart=_Fri__17_Feb_2023_17_49_59_+0900_M+r6Wd=8OhBf18uz Content-Type: text/plain; name="openh264-2.3.1-1.cygwin.patch" Content-Disposition: attachment; filename="openh264-2.3.1-1.cygwin.patch" Content-Transfer-Encoding: 7bit --- origsrc/openh264-2.3.1/CYGWIN-PATCHES/libopenh264.postinstall 1970-01-01 09:00:00.000000000 +0900 +++ src/openh264-2.3.1/CYGWIN-PATCHES/libopenh264.postinstall 2023-02-17 12:36:27.633701700 +0900 @@ -0,0 +1,18 @@ +if [ $(uname -m) = "x86_64" ] +then + POSTFIX="win64" +else + POSTFIX="win32" +fi +VERSION=$(cat /etc/libopenh264/version.txt) +cd /tmp +wget -q http://ciscobinary.openh264.org/openh264-${VERSION}-${POSTFIX}.dll.bz2 -O - | bunzip2 > openh264-${VERSION}-${POSTFIX}.tmp +if sha256sum --status -c /etc/libopenh264/openh264-${VERSION}-${POSTFIX}.dll.sha256 +then + mv openh264-${VERSION}-${POSTFIX}.tmp /usr/bin/libopenh264.dll +else + # Hash mismatch (or failed to download) + rm openh264-${VERSION}-${POSTFIX}.tmp + exit 1 +fi +chmod a+x /usr/bin/libopenh264.dll --- origsrc/openh264-2.3.1/CYGWIN-PATCHES/libopenh264.preremove 1970-01-01 09:00:00.000000000 +0900 +++ src/openh264-2.3.1/CYGWIN-PATCHES/libopenh264.preremove 2023-02-17 12:14:05.806697700 +0900 @@ -0,0 +1 @@ +rm /usr/bin/libopenh264.dll --Multipart=_Fri__17_Feb_2023_17_49_59_+0900_M+r6Wd=8OhBf18uz--