Please review wip/umurmur
Ken wong <[email protected]> Fri, 11 Jan 2013 20:00:04 -0600
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.wip.review |
|---|---|
| Message-ID | <[email protected]> |
--Apple-Mail-9--455801119 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Hello, I'm new to pkgsrc and wanted to contribute an update for wip/umurmur = version 0.2.10 (and two new required packages). It no longer requires the patches/* files, but uses PolarSSL 1.1.x. = Also, Google Protocol Buffers in C are no longer included in the = project. Since security/polarssl is now v1.2 which not work with umurmur, I've = created wip/polarssl11 and wip/protobuf-c. I was recently setup with a commit bit, but since I'm so new I thought = I'd email here first and ask for a little guidance.=20 Thanks, --Apple-Mail-9--455801119 Content-Disposition: attachment; filename=umurmur-0.2.10.patch Content-Type: application/octet-stream; name="umurmur-0.2.10.patch" Content-Transfer-Encoding: 7bit Index: polarssl11/DESCR =================================================================== RCS file: polarssl11/DESCR diff -N polarssl11/DESCR --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ polarssl11/DESCR 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,17 @@ +PolarSSL is a light-weight open source cryptographic and SSL/TLS library +written in C. PolarSSL is written with embedded systems in mind and has +been ported on a number of architectures, including ARM, PowerPC, MIPS +and Motorola 68000. + +Features include: + * Small memory footprint + * Clean and simple API for integration + * Loose coupling of cryptographic code. + * Symmetric encryption algorithms: AES, Triple-DES, DES, ARC4, Camellia, XTEA + * Hash algorithms: MD2, MD4, MD5, SHA-1, SHA-224, SHA-256, SHA-384, SHA-512 + * HAVEGE random number generator + * RSA with PKCS#1 v1.5 padding + * SSL version 3 and TLS version 1 client support + * X.509 certificate and CRL reading from memory or disk in PEM and DER formats + * Over 900 regression and code coverage tests + * Example applications Index: polarssl11/Makefile =================================================================== RCS file: polarssl11/Makefile diff -N polarssl11/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ polarssl11/Makefile 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,53 @@ +# $NetBSD$ +# + +DISTNAME= polarssl-1.1.4 +DISTFILES= polarssl-1.1.4-gpl.tgz +CATEGORIES= security +MASTER_SITES= http://polarssl.org/code/download/ +EXTRACT_SUFX= .tgz +FETCH_USING= fetch + +MAINTAINER= [email protected] +HOMEPAGE= https://polarssl.org/download/ +COMMENT= Open Source embedded SSL/TLS cryptographic library +LICENSE= gnu-gpl-v2 + +USE_TOOLS= gmake tar + +LDFLAGS.SunOS+= -lsocket -lnsl + +BINFILES= ssl/ssl_client1 ssl/ssl_client2 ssl/ssl_server aes/aescrypt2 \ + pkey/dh_client pkey/dh_genprime pkey/dh_server pkey/mpi_demo \ + pkey/rsa_genkey pkey/rsa_sign pkey/rsa_verify hash/hello \ + hash/md5sum hash/sha1sum hash/sha2sum test/ssl_cert_test \ + test/benchmark test/selftest test/ssl_test + +INCLUDE_FILES= aes.h arc4.h asn1.h base64.h bignum.h \ + bn_mul.h camellia.h certs.h cipher.h cipher_wrap.h config.h \ + ctr_drbg.h debug.h des.h dhm.h entropy.h entropy_poll.h \ + error.h havege.h md.h md2.h md4.h md5.h md_wrap.h net.h \ + openssl.h padlock.h pem.h pkcs11.h rsa.h sha1.h \ + sha2.h sha4.h ssl.h timing.h version.h x509.h \ + xtea.h +DSTDIR= ${WRKSRC}/.destdir +DSTDIR= ${PREFIX} + +DSTDIR= ${WRKDIR}/.destdir/${PREFIX} + +#install: do-install +# cmake install is broken, so we do it by hand +do-install: + install -d ${DSTDIR}/include/polarssl + install -d ${DSTDIR}/lib + install -d ${DSTDIR}/bin +.for i in ${INCLUDE_FILES} + ${INSTALL_DATA} ${WRKSRC}/include/polarssl/${i} ${DSTDIR}/include/polarssl/ +.endfor + ${INSTALL_DATA} ${WRKSRC}/library/libpolarssl.a ${DSTDIR}/lib/ +.for i in ${BINFILES} + ${INSTALL_PROGRAM} ${WRKSRC}/programs/${i} ${DSTDIR}/bin/polarssl_`basename ${i}` +.endfor + +# url2pkg-marker (please do not remove this line.) +.include "../../mk/bsd.pkg.mk" Index: polarssl11/PLIST =================================================================== RCS file: polarssl11/PLIST diff -N polarssl11/PLIST --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ polarssl11/PLIST 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,59 @@ +@comment $NetBSD$ +bin/polarssl_aescrypt2 +bin/polarssl_benchmark +bin/polarssl_dh_client +bin/polarssl_dh_genprime +bin/polarssl_dh_server +bin/polarssl_hello +bin/polarssl_md5sum +bin/polarssl_mpi_demo +bin/polarssl_rsa_genkey +bin/polarssl_rsa_sign +bin/polarssl_rsa_verify +bin/polarssl_selftest +bin/polarssl_sha1sum +bin/polarssl_sha2sum +bin/polarssl_ssl_cert_test +bin/polarssl_ssl_client1 +bin/polarssl_ssl_client2 +bin/polarssl_ssl_server +bin/polarssl_ssl_test +include/polarssl/aes.h +include/polarssl/arc4.h +include/polarssl/asn1.h +include/polarssl/base64.h +include/polarssl/bignum.h +include/polarssl/bn_mul.h +include/polarssl/camellia.h +include/polarssl/certs.h +include/polarssl/cipher.h +include/polarssl/cipher_wrap.h +include/polarssl/config.h +include/polarssl/ctr_drbg.h +include/polarssl/debug.h +include/polarssl/des.h +include/polarssl/dhm.h +include/polarssl/entropy.h +include/polarssl/entropy_poll.h +include/polarssl/error.h +include/polarssl/havege.h +include/polarssl/md.h +include/polarssl/md2.h +include/polarssl/md4.h +include/polarssl/md5.h +include/polarssl/md_wrap.h +include/polarssl/net.h +include/polarssl/openssl.h +include/polarssl/padlock.h +include/polarssl/pem.h +include/polarssl/pkcs11.h +include/polarssl/rsa.h +include/polarssl/sha1.h +include/polarssl/sha2.h +include/polarssl/sha4.h +include/polarssl/ssl.h +include/polarssl/timing.h +include/polarssl/version.h +include/polarssl/x509.h +include/polarssl/xtea.h +lib/libpolarssl.a Index: polarssl11/buildlink3.mk =================================================================== RCS file: polarssl11/buildlink3.mk diff -N polarssl11/buildlink3.mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ polarssl11/buildlink3.mk 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,13 @@ +# $NetBSD: $ + +BUILDLINK_TREE+= polarssl + +.if !defined(POLARSSL_BUILDLINK3_MK) +POLARSSL_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.polarssl+= polarssl>=1.1.4 +BUILDLINK_PKGSRCDIR.polarssl?= ../../wip/polarssl11 + +.endif # POLARSSL_BUILDLINK3_MK + +BUILDLINK_TREE+= -polarssl Index: polarssl11/distinfo =================================================================== RCS file: polarssl11/distinfo diff -N polarssl11/distinfo --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ polarssl11/distinfo 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,7 @@ +$NetBSD$ + +SHA1 (polarssl-1.1.4-gpl.tgz) = 3dd10bd1a8f7f58e0ef8c91cfa5ea7efd5d5f4bc +RMD160 (polarssl-1.1.4-gpl.tgz) = da5e218d1462561006841baff747f60bb4655f08 +Size (polarssl-1.1.4-gpl.tgz) = 611340 bytes +SHA1 (patch-Makefile) = 35e11e658ae12ea0be8f1c7a79596cb0456c722d +SHA1 (patch-library_net.c) = e73c4ce7011be07855b801571c073d86b96c632f Index: polarssl11/patches/patch-Makefile =================================================================== RCS file: polarssl11/patches/patch-Makefile diff -N polarssl11/patches/patch-Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ polarssl11/patches/patch-Makefile 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,11 @@ +--- Makefile.orig 2012-12-05 16:16:13.000000000 +0000 ++++ Makefile 2012-12-05 16:16:20.000000000 +0000 +@@ -7,7 +7,7 @@ + all: + cd library && $(MAKE) all && cd .. + cd programs && $(MAKE) all && cd .. +- cd tests && $(MAKE) all && cd .. ++# cd tests && $(MAKE) all && cd .. + + install: + mkdir -p $(DESTDIR)/include/polarssl Index: polarssl11/patches/patch-library_net.c =================================================================== RCS file: polarssl11/patches/patch-library_net.c diff -N polarssl11/patches/patch-library_net.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ polarssl11/patches/patch-library_net.c 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,17 @@ +--- library/net.c.orig 2011-12-22 10:06:27.000000000 +0000 ++++ library/net.c 2012-12-05 22:30:14.000000000 +0000 +@@ -59,10 +59,13 @@ + #include <netdb.h> + #include <errno.h> + +-#if defined(__FreeBSD__) || defined(__OpenBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ ++ defined(__DragonflyBSD__) + #include <sys/endian.h> + #elif defined(__APPLE__) + #include <machine/endian.h> ++#elif defined(sun) ++#include <sys/isa_defs.h> + #else + #include <endian.h> + #endif Index: protobuf-c/DESCR =================================================================== RCS file: protobuf-c/DESCR diff -N protobuf-c/DESCR --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ protobuf-c/DESCR 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,2 @@ +This package provides a code generator and runtime libraries to use +Protocol Buffers from pure C (not C++) Index: protobuf-c/Makefile =================================================================== RCS file: protobuf-c/Makefile diff -N protobuf-c/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ protobuf-c/Makefile 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,30 @@ +# $NetBSD$ +# + +DISTNAME= protobuf-c-0.15 +CATEGORIES= devel +MASTER_SITES= http://protobuf-c.googlecode.com/files/ + +MAINTAINER= [email protected] +HOMEPAGE= http://code.google.com/p/protobuf-c/ +COMMENT= Protocol Buffers for pure C +LICENSE= modified-bsd + +GNU_CONFIGURE= yes +USE_LANGUAGES= c++ c +USE_LIBTOOL= yes + +LIBS.SunOS= -lresolv -lsocket -lnsl + +SUBST_CLASSES+= conf +SUBST_STAGE.conf= post-patch +SUBST_FILES.conf= configure + +CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib +CONFIGURE_ENV+= CPPFLAGS=-L${LOCALBASE}/include + +# url2pkg-marker (please do not remove this line.) +.include "../../devel/zlib/buildlink3.mk" +.include "../../devel/protobuf/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: protobuf-c/PLIST =================================================================== RCS file: protobuf-c/PLIST diff -N protobuf-c/PLIST --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ protobuf-c/PLIST 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,8 @@ +@comment $NetBSD$ +bin/protoc-c +include/google/protobuf-c/protobuf-c-dispatch.h +include/google/protobuf-c/protobuf-c-private.h +include/google/protobuf-c/protobuf-c-rpc.h +include/google/protobuf-c/protobuf-c.h +lib/libprotobuf-c.la +lib/pkgconfig/libprotobuf-c.pc Index: protobuf-c/buildlink3.mk =================================================================== RCS file: protobuf-c/buildlink3.mk diff -N protobuf-c/buildlink3.mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ protobuf-c/buildlink3.mk 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,13 @@ +# $NetBSD: $ + +BUILDLINK_TREE+= protobuf-c + +.if !defined(PROTOBUF_BUILDLINK3_MK) +PROTOBUF_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.protobuf-c+= protobuf-c>=0.15 +BUILDLINK_PKGSRCDIR.protobuf-c?= ../../wip/protobuf-c + +.endif # PROTOBUF_BUILDLINK3_MK + +BUILDLINK_TREE+= -protobuf-c Index: protobuf-c/distinfo =================================================================== RCS file: protobuf-c/distinfo diff -N protobuf-c/distinfo --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ protobuf-c/distinfo 30 Dec 2012 21:44:06 -0000 @@ -0,0 +1,5 @@ +$NetBSD$ + +SHA1 (protobuf-c-0.15.tar.gz) = 4fbd93f492c52154713de1951c0a2133ddd43abb +RMD160 (protobuf-c-0.15.tar.gz) = 50319bba2b173aafb96dd1fe70550d378e69f871 +Size (protobuf-c-0.15.tar.gz) = 500911 bytes Index: umurmur/Makefile =================================================================== RCS file: /cvsroot/wip/umurmur/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- umurmur/Makefile 7 Oct 2012 17:41:39 -0000 1.3 +++ umurmur/Makefile 30 Dec 2012 21:44:06 -0000 @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.3 2012/10/07 17:41:39 asau Exp $ # -DISTNAME= umurmur-0.2.4 +DISTNAME= umurmur-0.2.10 CATEGORIES= comms MASTER_SITES= http://umurmur.googlecode.com/files/ @@ -10,9 +10,10 @@ HOMEPAGE= http://umurmur.googlecode.com/ COMMENT= Mumble (murmur) server for embedded systems LICENSE= 3-clause-bsd -WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_TOOLS+= gmake -NO_CONFIGURE= yes +GNU_CONFIGURE= yes + +LDFLAGS.SunOS+= -lresolv -lsocket -lnsl INSTALLATION_DIRS= sbin share/examples/umurmur @@ -21,22 +22,23 @@ CONF_FILES+= ${EGDIR}/umurmur.conf ${PKG SUBST_CLASSES+= conf SUBST_STAGE.conf= post-extract -SUBST_FILES.conf= conf.c +SUBST_FILES.conf= src/conf.* SUBST_SED.conf= -e 's,/etc/umurmur.conf,${PKG_SYSCONFDIR}/umurmur.conf,g' SUBST_CLASSES+= certdir SUBST_STAGE.certdir= post-extract -SUBST_FILES.certdir= ../umurmur.conf.example +SUBST_FILES.certdir= umurmur.conf.example SUBST_SED.certdir= -e 's,/etc,${PKG_SYSCONFDIR},g' MAKE_DIRS+= ${PKG_SYSCONFDIR}/umurmur RCD_SCRIPTS= umurmur do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/umurmurd ${DESTDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/../umurmur.conf.example \ + ${INSTALL_PROGRAM} ${WRKSRC}/src/umurmurd ${DESTDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/umurmur.conf.example \ ${DESTDIR}${EGDIR}/umurmur.conf .include "../../devel/libconfig/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" +.include "../../wip/protobuf-c/buildlink3.mk" +.include "../../wip/polarssl11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: umurmur/distinfo =================================================================== RCS file: /cvsroot/wip/umurmur/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- umurmur/distinfo 16 Oct 2010 17:09:38 -0000 1.1.1.1 +++ umurmur/distinfo 30 Dec 2012 21:44:06 -0000 @@ -1,7 +1,5 @@ $NetBSD: distinfo,v 1.1.1.1 2010/10/16 17:09:38 hoka_adam Exp $ -SHA1 (umurmur-0.2.4.tar.gz) = 38c602fea05de8f82ae2abccb98e91abbea65f52 -RMD160 (umurmur-0.2.4.tar.gz) = daf683eb75f1e903dbdf197af962da9ff3cf2ee3 -Size (umurmur-0.2.4.tar.gz) = 75505 bytes -SHA1 (patch-aa) = b97e094549a9fa27fd267aa63a8e67179ef678f7 -SHA1 (patch-ab) = b8ad6f83f9d54bbed170224fe82bf6f2aeb74a04 +SHA1 (umurmur-0.2.10.tar.gz) = 5a53b021078dfbdf001c9af9ff207ea84bcf8222 +RMD160 (umurmur-0.2.10.tar.gz) = 9967ab086832d9da7ff68b740fef1ea567ca6923 +Size (umurmur-0.2.10.tar.gz) = 161937 bytes --Apple-Mail-9--455801119 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122912 --Apple-Mail-9--455801119 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pkgsrc-wip-review mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-review --Apple-Mail-9--455801119--