Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Mar 2014 22:02:13 GMT
From:      Horia Racoviceanu <horia@racoviceanu.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/187513: [MAINTAINER] security/libscrypt: Update to 1.18
Message-ID:  <201403122202.s2CM2DTU028572@cgiserv.freebsd.org>
Resent-Message-ID: <201403122210.s2CMA0IM010580@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         187513
>Category:       ports
>Synopsis:       [MAINTAINER] security/libscrypt: Update to 1.18
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 12 22:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Horia Racoviceanu
>Release:        9.2-RELEASE
>Organization:
>Environment:
FreeBSD aitch 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC i386
>Description:

>How-To-Repeat:

>Fix:
- Version update to 1.18, Announce message:
  Replaced the b64 libraries with more portable one from ISC. Now tested and
  verified on a wider variety of architectures. Note, libscrypt_b64_encrypt was
  originally an exported function. This is no longer the case as it is
  considered an internal function only.

- Remove STATIC lib
- Change REINPLACE for CC, CFLAGS, LDFLAGS and LIBDIR
- Remove CFLAGS, now in REINPLACE
- Strip library

Build log:
https://redports.org/buildarchive/20140312211634-16716/

Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 348009)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libscrypt
-PORTVERSION=	1.14
-PORTREVISION=	1
+PORTVERSION=	1.18
 CATEGORIES=	security
 
 MAINTAINER=	horia@racoviceanu.com
@@ -16,23 +15,25 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	technion
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	8e6966e
+GH_COMMIT=	35b6894
 
 PLIST_FILES=	include/libscrypt.h \
-		lib/libscrypt.a \
 		lib/libscrypt.so \
 		lib/libscrypt.so.0
 
 PORTDOCS=	README.md
-
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.pre.mk>
+
 post-patch:
-	@${REINPLACE_CMD} -e '/^CC=gcc/d' -e '/CFLAGS=/s|$$| ${CFLAGS}|' \
-		-e 's|/usr/local|${PREFIX}| ; \
-		s|install: library|& install-static| ; \
-		s|$$(LDFLAGS)||' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|CC?=gcc|CC?=${CC}|; s|CFLAGS?=|CFLAGS+=|; \
+		s|LIBDIR       ?|LIBDIR        |' ${WRKSRC}/Makefile
 
+.if ${ARCH} == i386 && ${COMPILER_TYPE} == gcc
+	@${REINPLACE_CMD} -e 's|stack-protector|no-&|' ${WRKSRC}/Makefile
+.endif
+
 regression-test: build
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check)
 
@@ -40,10 +41,6 @@
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.pre.mk>
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so.0
 
-.if ${ARCH} == i386 && ${COMPILER_TYPE} == gcc
-CFLAGS+=	-fno-stack-protector
-.endif
-
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 348009)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (libscrypt-1.14.tar.gz) = 08d9f83eee4f2eb00c740357fd3648ce7d038ba4b5af2ee9fdc4319f76113e8b
-SIZE (libscrypt-1.14.tar.gz) = 20562
+SHA256 (libscrypt-1.18.tar.gz) = 5c8c59cc76bbbcb9d674fb72a668938cd2d6c5e1d5a302a8dc83f541f33b65ea
+SIZE (libscrypt-1.18.tar.gz) = 17418


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403122202.s2CM2DTU028572>