Re: NEW: devel/luacheck
On Thu, Apr 21, 2016 at 07:43:48PM +1000, Jonathan Gray wrote: > > Luacheck supports checking Lua files using syntax of Lua 5.1, Lua 5.2, > Lua 5.3 and LuaJIT 2.0. Luacheck itself is written in Lua and runs on > all of mentioned Lua versions. Just a heads up, the package couldn't build because PLIST is not up to date. Tried the program after running make plist and it worked fine for me, would definitely use it when it gets imported. Tested on amd64.
Re: updated port audio/py-last to 1.6.0
On Thu, Apr 28, 2016 at 08:19:11PM +0300, Андрей Болконский wrote: > now everythings is OK? Your diff appears to be mangled? -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: sysutils/logstash/forwarder should not strip lang/go binaries
On Thu, May 05, 2016 at 12:07:01AM +0200, Dmitrij D. Czarkoff wrote: > Dmitrij D. Czarkoff said: > > Stuart Henderson said: > > > On 2016/04/21 19:35, Christian Weisgerber wrote: > > >> Dmitrij D. Czarkoff: > > >> > > I think you should just set > > INSTALL_STRIP = > > in the ports (or modules) that require it and be done with it. > > No point in introducing yet another variable. > > >>> > > >>> INSTALL_STRIP is mentioned in mk.conf(5), so it is a user setting. > > >>> /etc/mk.conf may contain INSTALL_STRIP=-s, and that would override > > >>> INSTALL_STRIP= from port. > > >> > > >> In practice, INSTALL_STRIP has two possible values: "-s" and "". > > >> "-s" is already the default, so the only user setting that makes > > >> any sense is "". Having some ports already set it to "" is just > > >> fine. > > >> > > >> A few ports already do this. > > > > > > Makes sense to me. go-bootstrap needs it too. > > > > Well, then asking for OKs for the following patch. > > I totally forgot about this. Updated version of the patch follows. It > touchs directly: > > * lang/go > * lang/go-bootstrap > * net/syncthing > * sysutils/terraform > > and indirectly every port with MODULES=lang/go. That said, only lang/go > and lang/go-bootstrap suffer changes in binaries - other ports either > include own workarounds I remove or use MODGO_INSTALL_TARGET from > lang/go MODULE, which never had this issue in the first place. I am OK with this but why don't you use INSTALL_PROGRAM in the MODGO_INSTALL_TARGET then, instead of cp? I'd give us more control about the owner/mode no? > -- > Dmitrij D. Czarkoff > > Index: lang/go/Makefile > === > RCS file: /cvs/ports/lang/go/Makefile,v > retrieving revision 1.29 > diff -u -p -r1.29 Makefile > --- lang/go/Makefile 14 Apr 2016 17:43:26 - 1.29 > +++ lang/go/Makefile 4 May 2016 21:46:35 - > @@ -8,6 +8,7 @@ VERSION = 1.5.4 > EXTRACT_SUFX = .src.tar.gz > DISTNAME = go${VERSION} > PKGNAME =go-${VERSION} > +REVISION = 0 > CATEGORIES = lang > > HOMEPAGE = https://golang.org/ > @@ -29,6 +30,8 @@ SUBST_VARS =GOCFG > > WRKDIST =${WRKDIR}/go > WRKSRC = ${WRKDIST}/src > + > +INSTALL_STRIP = > > GOOS = openbsd > GOARCH = unknown > Index: lang/go/go.port.mk > === > RCS file: /cvs/ports/lang/go/go.port.mk,v > retrieving revision 1.6 > diff -u -p -r1.6 go.port.mk > --- lang/go/go.port.mk28 Feb 2016 13:24:16 - 1.6 > +++ lang/go/go.port.mk4 May 2016 21:47:45 - > @@ -53,6 +53,10 @@ MODGO_INSTALL_TARGET = ${INSTALL_DATA_DI > ${MODGO_PACKAGE_PATH}; > .endif > > +# Although this module does not use INSTALL_PROGRAM, unset INSTALL_STRIP to > +# prevent stripping go programs in ports with custom do-install targets. > +INSTALL_STRIP = > + > MODGO_TEST_TARGET = ${MODGO_TEST_CMD} ${TEST_TARGET} > > .if empty(CONFIGURE_STYLE) > Index: lang/go-bootstrap/Makefile > === > RCS file: /cvs/ports/lang/go-bootstrap/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- lang/go-bootstrap/Makefile4 Dec 2015 17:19:18 - 1.1.1.1 > +++ lang/go-bootstrap/Makefile4 May 2016 21:48:19 - > @@ -8,6 +8,7 @@ VERSION = 1.4.3 > EXTRACT_SUFX = .src.tar.gz > DISTNAME = go${VERSION} > PKGNAME =go-bootstrap-${VERSION} > +REVISION = 0 > CATEGORIES = lang > > HOMEPAGE = https://golang.org/ > @@ -31,6 +32,8 @@ SUBST_VARS =GOEXE GOCFG > > WRKDIST =${WRKDIR}/go > WRKSRC = ${WRKDIST}/src > + > +INSTALL_STRIP = > > GOOS = openbsd > GOARCH = unknown > Index: net/syncthing/Makefile > === > RCS file: /cvs/ports/net/syncthing/Makefile,v > retrieving revision 1.2 > diff -u -p -r1.2 Makefile > --- net/syncthing/Makefile23 Apr 2016 08:02:05 - 1.2 > +++ net/syncthing/Makefile4 May 2016 21:51:13 - > @@ -34,8 +34,7 @@ do-test: > cd ${WRKSRC} && ${MODGO_CMD} run build.go test > > do-install: > - # Note: Don't use INSTALL_PROGRAM. It strips, and go hates this. > - ${INSTALL_SCRIPT} ${WRKSRC}/bin/syncthing ${PREFIX}/bin/ > + ${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${PREFIX}/bin/ > .for sec in 1 5 7 > ${INSTALL_MAN} ${WRKSRC}/man/*.${sec} ${PREFIX}/man/man${sec}/ > .endfor > Index: sysutils/terraform/Makefile > === > RCS file: /cvs/ports/sysutils/terraform/Makefile,v > retrieving revision 1.4 > diff
Re: NEW: www/pecl-apcu
On 2016/05/03 22:00, Dmitry Alenichev wrote: > Hello. > > APCu (APC User Cache) PHP-module port in attachment. > I'd like to use a different COMMENT and DESCR (below). Otherwise this looks good to me, would any developers like to give an OK to import?: COMMENT = userland caching for PHP (APC User Cache) pkg/DESCR: APCu is a PHP extension providing userland caching (and dumping) of variables. It is a derivative of "APC" but has been stripped of opcode caching which is now implemented directly in PHP as of 5.5. pecl-apcu.tgz Description: application/tar-gz
Re: sysutils/logstash/forwarder should not strip lang/go binaries
On 2016/05/05 11:29, Dmitrij D. Czarkoff wrote: > Antoine Jacoutot said: > > I am OK with this but why don't you use INSTALL_PROGRAM in the > > MODGO_INSTALL_TARGET then, instead of cp? > > I'd give us more control about the owner/mode no? > > The patch below adds this change. But pkg_create already resets > owner/mode anyway, so I am not sure it is really needed. pkg_create checks but doesn't reset. (I run into package failures all over the place when I'm on a machine with umask 077 and try to build a package without remembering to loosen it...) > FWIW I planned to switch MODGO_INSTALL_TARGET for libraries to > INSTALL_DATA, but I don't think this should be done in this commit. > > -- > Dmitrij D. Czarkoff > > Index: lang/go/Makefile ok
Re: sysutils/logstash/forwarder should not strip lang/go binaries
Antoine Jacoutot said: > I am OK with this but why don't you use INSTALL_PROGRAM in the > MODGO_INSTALL_TARGET then, instead of cp? > I'd give us more control about the owner/mode no? The patch below adds this change. But pkg_create already resets owner/mode anyway, so I am not sure it is really needed. FWIW I planned to switch MODGO_INSTALL_TARGET for libraries to INSTALL_DATA, but I don't think this should be done in this commit. -- Dmitrij D. Czarkoff Index: lang/go/Makefile === RCS file: /cvs/ports/lang/go/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- lang/go/Makefile14 Apr 2016 17:43:26 - 1.29 +++ lang/go/Makefile4 May 2016 21:46:35 - @@ -8,6 +8,7 @@ VERSION = 1.5.4 EXTRACT_SUFX = .src.tar.gz DISTNAME = go${VERSION} PKGNAME = go-${VERSION} +REVISION = 0 CATEGORIES = lang HOMEPAGE = https://golang.org/ @@ -29,6 +30,8 @@ SUBST_VARS = GOCFG WRKDIST = ${WRKDIR}/go WRKSRC = ${WRKDIST}/src + +INSTALL_STRIP = GOOS = openbsd GOARCH = unknown Index: lang/go/go.port.mk === RCS file: /cvs/ports/lang/go/go.port.mk,v retrieving revision 1.6 diff -u -p -r1.6 go.port.mk --- lang/go/go.port.mk 28 Feb 2016 13:24:16 - 1.6 +++ lang/go/go.port.mk 5 May 2016 08:28:24 - @@ -40,8 +40,9 @@ CATEGORIES += lang/go MODGO_BUILD_TARGET = ${MODGO_BUILD_CMD} ${ALL_TARGET} MODGO_FLAGS ?= -x +INSTALL_STRIP = .if ${MODGO_TYPE:L:Mbin} -MODGO_INSTALL_TARGET = cp ${MODGO_WORKSPACE}/bin/* ${PREFIX}/bin +MODGO_INSTALL_TARGET = ${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/* ${PREFIX}/bin .endif # Go source files serve the purpose of libraries, so sources should be included Index: lang/go-bootstrap/Makefile === RCS file: /cvs/ports/lang/go-bootstrap/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- lang/go-bootstrap/Makefile 4 Dec 2015 17:19:18 - 1.1.1.1 +++ lang/go-bootstrap/Makefile 4 May 2016 21:48:19 - @@ -8,6 +8,7 @@ VERSION = 1.4.3 EXTRACT_SUFX = .src.tar.gz DISTNAME = go${VERSION} PKGNAME = go-bootstrap-${VERSION} +REVISION = 0 CATEGORIES = lang HOMEPAGE = https://golang.org/ @@ -31,6 +32,8 @@ SUBST_VARS = GOEXE GOCFG WRKDIST = ${WRKDIR}/go WRKSRC = ${WRKDIST}/src + +INSTALL_STRIP = GOOS = openbsd GOARCH = unknown Index: net/syncthing/Makefile === RCS file: /cvs/ports/net/syncthing/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- net/syncthing/Makefile 23 Apr 2016 08:02:05 - 1.2 +++ net/syncthing/Makefile 4 May 2016 21:51:13 - @@ -34,8 +34,7 @@ do-test: cd ${WRKSRC} && ${MODGO_CMD} run build.go test do-install: - # Note: Don't use INSTALL_PROGRAM. It strips, and go hates this. - ${INSTALL_SCRIPT} ${WRKSRC}/bin/syncthing ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${PREFIX}/bin/ .for sec in 1 5 7 ${INSTALL_MAN} ${WRKSRC}/man/*.${sec} ${PREFIX}/man/man${sec}/ .endfor Index: sysutils/terraform/Makefile === RCS file: /cvs/ports/sysutils/terraform/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- sysutils/terraform/Makefile 3 May 2016 16:16:47 - 1.4 +++ sysutils/terraform/Makefile 4 May 2016 21:53:15 - @@ -35,9 +35,6 @@ PROVIDERS=atlas aws azure azurerm chef PROVISIONERS= chef file local-exec remote-exec -# prevent stripping go binaries -INSTALL_STRIP= - post-build: .for provider in ${PROVIDERS} cd ${WRKSRC} && \
Re: sysutils/logstash/forwarder should not strip lang/go binaries
On Thu, May 05, 2016 at 11:29:37AM +0200, Dmitrij D. Czarkoff wrote: > Antoine Jacoutot said: > > I am OK with this but why don't you use INSTALL_PROGRAM in the > > MODGO_INSTALL_TARGET then, instead of cp? > > I'd give us more control about the owner/mode no? > > The patch below adds this change. But pkg_create already resets > owner/mode anyway, so I am not sure it is really needed. > > FWIW I planned to switch MODGO_INSTALL_TARGET for libraries to > INSTALL_DATA, but I don't think this should be done in this commit. OK aja > > -- > Dmitrij D. Czarkoff > > Index: lang/go/Makefile > === > RCS file: /cvs/ports/lang/go/Makefile,v > retrieving revision 1.29 > diff -u -p -r1.29 Makefile > --- lang/go/Makefile 14 Apr 2016 17:43:26 - 1.29 > +++ lang/go/Makefile 4 May 2016 21:46:35 - > @@ -8,6 +8,7 @@ VERSION = 1.5.4 > EXTRACT_SUFX = .src.tar.gz > DISTNAME = go${VERSION} > PKGNAME =go-${VERSION} > +REVISION = 0 > CATEGORIES = lang > > HOMEPAGE = https://golang.org/ > @@ -29,6 +30,8 @@ SUBST_VARS =GOCFG > > WRKDIST =${WRKDIR}/go > WRKSRC = ${WRKDIST}/src > + > +INSTALL_STRIP = > > GOOS = openbsd > GOARCH = unknown > Index: lang/go/go.port.mk > === > RCS file: /cvs/ports/lang/go/go.port.mk,v > retrieving revision 1.6 > diff -u -p -r1.6 go.port.mk > --- lang/go/go.port.mk28 Feb 2016 13:24:16 - 1.6 > +++ lang/go/go.port.mk5 May 2016 08:28:24 - > @@ -40,8 +40,9 @@ CATEGORIES += lang/go > MODGO_BUILD_TARGET = ${MODGO_BUILD_CMD} ${ALL_TARGET} > MODGO_FLAGS ?= -x > > +INSTALL_STRIP = > .if ${MODGO_TYPE:L:Mbin} > -MODGO_INSTALL_TARGET = cp ${MODGO_WORKSPACE}/bin/* ${PREFIX}/bin > +MODGO_INSTALL_TARGET = ${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/* > ${PREFIX}/bin > .endif > > # Go source files serve the purpose of libraries, so sources should be > included > Index: lang/go-bootstrap/Makefile > === > RCS file: /cvs/ports/lang/go-bootstrap/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- lang/go-bootstrap/Makefile4 Dec 2015 17:19:18 - 1.1.1.1 > +++ lang/go-bootstrap/Makefile4 May 2016 21:48:19 - > @@ -8,6 +8,7 @@ VERSION = 1.4.3 > EXTRACT_SUFX = .src.tar.gz > DISTNAME = go${VERSION} > PKGNAME =go-bootstrap-${VERSION} > +REVISION = 0 > CATEGORIES = lang > > HOMEPAGE = https://golang.org/ > @@ -31,6 +32,8 @@ SUBST_VARS =GOEXE GOCFG > > WRKDIST =${WRKDIR}/go > WRKSRC = ${WRKDIST}/src > + > +INSTALL_STRIP = > > GOOS = openbsd > GOARCH = unknown > Index: net/syncthing/Makefile > === > RCS file: /cvs/ports/net/syncthing/Makefile,v > retrieving revision 1.2 > diff -u -p -r1.2 Makefile > --- net/syncthing/Makefile23 Apr 2016 08:02:05 - 1.2 > +++ net/syncthing/Makefile4 May 2016 21:51:13 - > @@ -34,8 +34,7 @@ do-test: > cd ${WRKSRC} && ${MODGO_CMD} run build.go test > > do-install: > - # Note: Don't use INSTALL_PROGRAM. It strips, and go hates this. > - ${INSTALL_SCRIPT} ${WRKSRC}/bin/syncthing ${PREFIX}/bin/ > + ${INSTALL_PROGRAM} ${WRKSRC}/bin/syncthing ${PREFIX}/bin/ > .for sec in 1 5 7 > ${INSTALL_MAN} ${WRKSRC}/man/*.${sec} ${PREFIX}/man/man${sec}/ > .endfor > Index: sysutils/terraform/Makefile > === > RCS file: /cvs/ports/sysutils/terraform/Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 Makefile > --- sysutils/terraform/Makefile 3 May 2016 16:16:47 - 1.4 > +++ sysutils/terraform/Makefile 4 May 2016 21:53:15 - > @@ -35,9 +35,6 @@ PROVIDERS= atlas aws azure azurerm chef > > PROVISIONERS=chef file local-exec remote-exec > > -# prevent stripping go binaries > -INSTALL_STRIP= > - > post-build: > .for provider in ${PROVIDERS} > cd ${WRKSRC} && \ -- Antoine
Re: Use arc4random in devel/glib2
2016-05-05 3:00 GMT+03:00 Michael McConville: > I've had this sitting around for a while. > > GLib's g_rand* functions use a simple Mersenne Twister, and the docs > warn against their use where strong randomness is needed: > > https://developer.gnome.org/glib/stable/glib-Random-Numbers.html > > g_rand_* are deterministic, while g_random_* are nondeterministic. > > Grepping for these functions in ports' source show that many projects > use them in crypto code. I've talked to the GNOME developers about this, > and they're considering how to deal with it. I've also reported bugs to > a handful of projects using these functions dangerously. > > In the meantime, I think it's best to patch g_random_int() to call > arc4random(). The semantics are identical and g_random_int() is the most > commonly used of these functions, so I think it's a good place to start. > The others will probably take a little more care. > > It doesn't cause test regressions, and the change seems straightforward. > > > Index: Makefile > === > RCS file: /cvs/ports/devel/glib2/Makefile,v > retrieving revision 1.252 > diff -u -p -u -r1.252 Makefile > --- Makefile18 Apr 2016 06:46:30 - 1.252 > +++ Makefile4 May 2016 23:42:20 - > @@ -4,6 +4,7 @@ COMMENT=general-purpose utility librar > > GNOME_PROJECT= glib > GNOME_VERSION= 2.48.0 > +REVISION= 0 > PKGNAME= ${DISTNAME:S/glib/glib2/} > > CATEGORIES=devel > Index: patches/patch-glib_grand_c > === > RCS file: patches/patch-glib_grand_c > diff -N patches/patch-glib_grand_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-glib_grand_c 4 May 2016 23:42:20 - > @@ -0,0 +1,16 @@ > +$OpenBSD$ > +--- glib/grand.c.orig Mon Feb 29 09:32:44 2016 > glib/grand.c Wed May 4 19:31:36 2016 > +@@ -649,11 +649,7 @@ get_global_random (void) > + guint32 > + g_random_int (void) > + { > +- guint32 result; > +- G_LOCK (global_random); > +- result = g_rand_int (get_global_random ()); > +- G_UNLOCK (global_random); > +- return result; > ++ return arc4random (); > + } > + > + /** Nice work! okay zhuk@ (but my okay could be only complementary to one of the GNOME maintainers). -- WBR, Vadim Zhukov
Re: Use arc4random in devel/glib2
glib2 is a pretty clean port patch-wise. This sort of thing would be better done with proper autoconf etc so it can go upstream. On 2016/05/05 15:02, Vadim Zhukov wrote: > 2016-05-05 3:00 GMT+03:00 Michael McConville: > > I've had this sitting around for a while. > > > > GLib's g_rand* functions use a simple Mersenne Twister, and the docs > > warn against their use where strong randomness is needed: > > > > https://developer.gnome.org/glib/stable/glib-Random-Numbers.html > > > > g_rand_* are deterministic, while g_random_* are nondeterministic. > > > > Grepping for these functions in ports' source show that many projects > > use them in crypto code. I've talked to the GNOME developers about this, > > and they're considering how to deal with it. I've also reported bugs to > > a handful of projects using these functions dangerously. > > > > In the meantime, I think it's best to patch g_random_int() to call > > arc4random(). The semantics are identical and g_random_int() is the most > > commonly used of these functions, so I think it's a good place to start. > > The others will probably take a little more care. > > > > It doesn't cause test regressions, and the change seems straightforward. > > > > > > Index: Makefile > > === > > RCS file: /cvs/ports/devel/glib2/Makefile,v > > retrieving revision 1.252 > > diff -u -p -u -r1.252 Makefile > > --- Makefile18 Apr 2016 06:46:30 - 1.252 > > +++ Makefile4 May 2016 23:42:20 - > > @@ -4,6 +4,7 @@ COMMENT=general-purpose utility librar > > > > GNOME_PROJECT= glib > > GNOME_VERSION= 2.48.0 > > +REVISION= 0 > > PKGNAME= ${DISTNAME:S/glib/glib2/} > > > > CATEGORIES=devel > > Index: patches/patch-glib_grand_c > > === > > RCS file: patches/patch-glib_grand_c > > diff -N patches/patch-glib_grand_c > > --- /dev/null 1 Jan 1970 00:00:00 - > > +++ patches/patch-glib_grand_c 4 May 2016 23:42:20 - > > @@ -0,0 +1,16 @@ > > +$OpenBSD$ > > +--- glib/grand.c.orig Mon Feb 29 09:32:44 2016 > > glib/grand.c Wed May 4 19:31:36 2016 > > +@@ -649,11 +649,7 @@ get_global_random (void) > > + guint32 > > + g_random_int (void) > > + { > > +- guint32 result; > > +- G_LOCK (global_random); > > +- result = g_rand_int (get_global_random ()); > > +- G_UNLOCK (global_random); > > +- return result; > > ++ return arc4random (); > > + } > > + > > + /** > > Nice work! okay zhuk@ (but my okay could be only complementary to one > of the GNOME maintainers). > > -- > WBR, > Vadim Zhukov >
Re: UPDATE: math/R
On Tue, May 03, 2016 at 08:04:10PM +0200, Ingo Feinerer wrote: > On Tue, May 03, 2016 at 07:58:10PM +0300, Paul Irofti wrote: > > > there is one new patch as configure looks for system zlib >= 1.2.5 (and > > > we only have 1.2.3 in base). > > > > Why is it looking for 1.2.5 specifically? > > I do not know. So far R works fine for me with zlib from base. Go ahead then.
Re: Use arc4random in devel/glib2
Stuart Henderson said: > glib2 is a pretty clean port patch-wise. This sort of thing would be > better done with proper autoconf etc so it can go upstream. Totally agree. It would be best if upstream would maintain the code. They could benefit from arc4random on other BSDs and libbsd-enabled platforms as well. -- Dmitrij D. Czarkoff
Re: mariadb, encrypt() does not work
On 2016/05/05 04:16, mike-...@ya.ru wrote: > Seems it happens after this change: > http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/crypt/crypt.c.diff?r1=1.26=1.27 Yes. https://mariadb.com/kb/en/mariadb/encrypt/: > Encrypts str using the Unix crypt() system call (sic: it's actually a library function not a system call). This doesn't give any guarantees about encryption type though. It just passes to the OS. > If crypt() function entirely excluded from the system, the problem would be > detected on time > and solved by linking with a third party library, as is done in other systems. No, there's no fallback. Yes we should disable this properly so that have_crypt is set correctly. But the behaviour in that case would be the same as you're seeing now. As they say: "If the have_crypt system variable is set to NO (because the crypt() system call is not available), the ENCRYPT function will always return NULL." Here's the code. sql/item_strfunc.cc: 2230 String *Item_func_encrypt::val_str(String *str) 2231 { 2232 DBUG_ASSERT(fixed == 1); 2233 String *res =args[0]->val_str(str); 2234 2235 #ifdef HAVE_CRYPT 2236 char salt[3],*salt_ptr; 2237 if ((null_value=args[0]->null_value)) 2238 return 0; 2239 if (res->length() == 0) 2240 return make_empty_result(); 2241 if (arg_count == 1) 2242 { // generate random salt 2243 time_t timestamp=current_thd->query_start(); 2244 salt[0] = bin_to_ascii( (ulong) timestamp & 0x3f); 2245 salt[1] = bin_to_ascii(( (ulong) timestamp >> 5) & 0x3f); 2246 salt[2] = 0; 2247 salt_ptr=salt; 2248 } 2249 else 2250 { // obtain salt from the first two bytes 2251 String *salt_str=args[1]->val_str(_value); 2252 if ((null_value= (args[1]->null_value || salt_str->length() < 2))) 2253 return 0; 2254 salt_ptr= salt_str->c_ptr_safe(); 2255 } 2256 mysql_mutex_lock(_crypt); 2257 char *tmp= crypt(res->c_ptr_safe(),salt_ptr); 2258 if (!tmp) 2259 { 2260 mysql_mutex_unlock(_crypt); 2261 null_value= 1; 2262 return 0; 2263 } 2264 str->set(tmp, (uint) strlen(tmp), _charset_bin); 2265 str->copy(); 2266 mysql_mutex_unlock(_crypt); 2267 return str; 2268 #else 2269 null_value=1; 2270 return 0; 2271 #endif /* HAVE_CRYPT */ 2272 } > It comes to updating the OS and migration of existing databases. MySQL/MariaDB's password storage support are *junk*. The only native support for salted storage is this ancient crypt. No bcrypt, scrypt, argon2. Even for things like salted SHA-2 you need to construct it yourself. I'd look at ways to handle this in the application instead where you should have access to better tools. Migrate to proper password storage in the database with a fallback in the application to handle unconverted passwords. This can be done before upgrading the db server and continue to function afterwards. Best method is probably to bulk-update all the existing entries so you store "newhash(salt+crypted)" then when someone tries to log in, if "newhash(salt+password)" fails you can try "newhash(salt+crypt(password))" and update the stored entry. (http://www.lornajane.net/posts/2016/upgrade-better-passwords-php)
Re: [update] samba-4.4.3
Quoting j...@wxcvbn.org: Here's latest upstream release, mostly addressing regressions from samba-4.4.2. Lightly tested on amd64 in a DC setup. -->8-- = Release Notes for Samba 4.4.3 May 2, 2016 = This is the latest stable release of Samba 4.4. This release fixes some regressions introduced by the last security fixes. Please see bug https://bugzilla.samba.org/show_bug.cgi?id=11849 for a list of bugs addressing these regressions and more information. Changes since 4.4.2: o Michael Adam* BUG 11786: idmap_hash: Only allow the hash module for default idmap config. o Jeremy Allison * BUG 11822: s3: libsmb: Fix error where short name length was read as 2 bytes, should be 1. o Andrew Bartlett * BUG 11789: Fix returning of ldb.MessageElement. o Ralph Boehme * BUG 11855: cleanupd: Restart as needed. o Günther Deschner * BUG 11786: s3:winbindd:idmap: check loadparm in domain_has_idmap_config() helper as well. * BUG 11789: libsmb/pysmb: Add pytalloc-util dependency to fix the build. o Volker Lendecke * BUG 11786: winbind: Fix CID 1357100: Unchecked return value. * BUG 11816: nwrap: Fix the build on Solaris. * BUG 11827: vfs_catia: Fix memleak. * BUG 11878: smbd: Avoid large reads beyond EOF. o Stefan Metzmacher * BUG 11789: s3:wscript: pylibsmb depends on pycredentials. * BUG 11841: Fix NT_STATUS_ACCESS_DENIED when accessing Windows public share. * BUG 11847: Only validate MIC if "map to guest" is not being used. * BUG 11849: auth/ntlmssp: Add ntlmssp_{client,server}:force_old_spnego option for testing. * BUG 11850: NetAPP SMB servers don't negotiate NTLMSSP_SIGN. * BUG 11858: Allow anonymous smb connections. * BUG 11870: Fix ads_sasl_spnego_gensec_bind(KRB5). * BUG 11872: Fix 'wbinfo -u' and 'net ads search'. o Tom Mortensen * BUG 11875: nss_wins: Fix the hostent setup. o Garming Sam * BUG 11789: build: Mark explicit dependencies on pytalloc-util. o Partha Sarathi * BUG 11819: Fix the smb2_setinfo to handle FS info types and FSQUOTA infolevel. o Jorge Schrauwen * BUG 11816: configure: Don't check for inotify on illumos. o Uri Simchoni * BUG 11806: vfs_acl_common: Avoid setting POSIX ACLs if "ignore system acls" is set. * BUG 11815: smbcquotas: print "NO LIMIT" only if returned quota value is 0. * BUG 11852: libads: Record session expiry for spnego sasl binds. o Hemanth Thummala * BUG 11840: Mask general purpose signals for notifyd. --8<-- Index: Makefile === RCS file: /cvs/ports/net/samba/Makefile,v retrieving revision 1.223 diff -u -p -r1.223 Makefile --- Makefile 25 Apr 2016 15:01:29 - 1.223 +++ Makefile 2 May 2016 17:23:18 - @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.223 2016/04/25 15:01:29 jca Exp $ -VERSION = 4.4.2 +VERSION = 4.4.3 DISTNAME = samba-${VERSION} COMMENT-main = SMB and CIFS client and server for UNIX @@ -15,10 +15,8 @@ PKGNAME-tevent = tevent-${TEVENT_V} PKGNAME-util = samba-util-${VERSION} PKGNAME-docs = samba-docs-${VERSION} -REVISION-main = 0 REVISION-ldb = 0 REVISION-tevent = 0 -REVISION-util = 0 PKG_ARCH-docs = * Index: distinfo === RCS file: /cvs/ports/net/samba/distinfo,v retrieving revision 1.50 diff -u -p -r1.50 distinfo --- distinfo 22 Apr 2016 11:48:36 - 1.50 +++ distinfo 2 May 2016 11:48:10 - @@ -1,2 +1,2 @@ -SHA256 (samba-4.4.2.tar.gz) = 6uzUGoXruVB7jbmFatoqlJN26dU891ZktUk2WPblkmo= -SIZE (samba-4.4.2.tar.gz) = 20711230 +SHA256 (samba-4.4.3.tar.gz) = Ax5q2m0V3q5oUIRe7UFJevMiB/tnnWxsdPGazJnUN7o= +SIZE (samba-4.4.3.tar.gz) = 20705861 --jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE Works great and tested with two installations as DCs in a Samba domain -- no issues noticed for the past two days. Thanks very much. Please let me know if any other tests may be of use to developers or users. -rw-r--r-- 3 vijay vijay 18775595 May 3 11:40 samba-4.4.3.tgz -rw-r--r-- 3 vijay vijay 5869 May 3 11:40 samba-util-4.4.3.tgz -rw-r--r-- 4 vijay vijay 174042 May 3 11:40 samba-docs-4.4.3.tgz Vijay -- Vijay Sankar, M.Eng., P.Eng. ForeTell Technologies Limited vsan...@foretell.ca
Re: UPDATE: databases/mongodb
Updated according to feedback: * Using MODPY_BIN instead of hardcoded python2.7 * Using system boost. Because the boost port is configured without C++11 support, I had to disable use of the user config. * Just use $CC and $CXX. Had to patch SConstruct to include the environment PATH. * Added DPB_PROPERTIES = parallel * Rephrased WiredTiger comment. * Moved each module to its own line. * Removed erroneous testing dependency. Attached as well to prevent email whitespace mangling, just in case. Patch = commit b51751b5ae16f188713628cad85f88448ed8343c Author: Andrew AldridgeDate: Sat Apr 30 05:31:12 2016 -0400 Update to 3.2.6 diff --git a/Makefile b/Makefile index 8c03687..f18c73b 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,13 @@ PORTROACH =limitw:1,even -#atomic_int.h: error "unsupported compiler or platform" on other archs -ONLY_FOR_ARCHS = i386 amd64 +# The default storage engine (WiredTiger) only works on amd64. +ONLY_FOR_ARCHS = amd64 +DPB_PROPERTIES = parallel COMMENT = scalable, high-performance document-oriented database -DISTNAME = mongodb-src-r2.6.4 +DISTNAME = mongodb-src-r3.2.6 PKGNAME = ${DISTNAME:S/src-r//} REVISION = 0 CATEGORIES = databases @@ -17,43 +18,58 @@ HOMEPAGE = http://www.mongodb.org/ # Apache 2.0 + AGPLv3 PERMIT_PACKAGE_CDROM = Yes -WANTLIB = boost_filesystem-mt boost_program_options-mt boost_system-mt \ - boost_thread-mt c execinfo m pcap pcre pcrecpp pthread \ - stdc++ v8 yaml-cpp +WANTLIB = c boost_chrono-mt boost_filesystem-mt \ + boost_program_options-mt boost_regex-mt boost_system-mt \ + boost_thread-mt execinfo kvm m pcap pcre pcrecpp pthread \ + estdc++ yaml-cpp z MASTER_SITES = http://downloads.mongodb.org/src/ -MODULES = devel/scons -MODSCONS_FLAGS = --prefix="${PREFIX}" \ ---cpppath="${LOCALBASE}/include/nspr" \ ---extralib="pcrecpp" \ ---usev8 \ ---sharedclient \ ---full \ ---use-system-pcre \ ---use-system-boost \ ---use-system-v8 \ ---use-system-yaml - -MAKE_ENV +=HOME="${HOME}" \ - TERM="${TERM}" \ - CXXFLAGS="$(CXXFLAGS)" \ - LIBmongoclient_VERSION="${LIBmongoclient_VERSION}" -LIB_DEPENDS = devel/boost \ - devel/libexecinfo \ +MODULES = gcc4 \ + devel/scons \ + lang/python + +MODGCC4_ARCHS =amd64 +MODGCC4_LANGS =c c++ +MODPY_VERSION =2.7 +ALL_TARGET = core tools +MODSCONS_ENV = CC="${CC}" \ + CXX="${CXX}" \ + CCFLAGS="${CFLAGS} -DBOOST_NO_USER_CONFIG" \ + CXXFLAGS="${CXXFLAGS}" \ + LINKFLAGS="${LDFLAGS}" \ + CPPPATH="${LOCALBASE}/include" \ + LIBPATH="${LOCALBASE}/lib" +MODSCONS_FLAGS += --prefix="${PREFIX}" \ + --opt=on \ + --allocator=system \ + --use-system-boost \ + --use-system-pcre \ + --use-system-yaml \ + --use-system-zlib \ + -j${MAKE_JOBS} + +ALL_TARGET = core tools +LIB_DEPENDS = devel/libexecinfo \ + devel/boost \ devel/pcre \ - devel/yaml-cpp \ - lang/libv8 + devel/yaml-cpp +TEST_DEPENDS = lang/python/2.7 \ + textproc/py-yaml \ + databases/py-mongo + +do-install: + ${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKSRC} \ + ${MODSCONS_ENV} ${MODSCONS_FLAGS} ${INSTALL_TARGET} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mongodb ${INSTALL_DATA} ${FILESDIR}/mongodb.conf \ ${PREFIX}/share/examples/mongodb -# Regression tests require at least 256 file descriptors and ~700MB do-test: @${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKSRC} \ - ${MODSCONS_ENV} ${MODSCONS_FLAGS} test && \ - ${WRKSRC}/test --dbpath ${WRKSRC}/unittest + ${MODSCONS_ENV} ${MODSCONS_FLAGS} unittests + cd ${WRKSRC} && ${MODPY_BIN} buildscripts/resmoke.py --suites=unittests .include diff --git a/distinfo b/distinfo index 2bf23a9..1139d2f 100644 --- a/distinfo +++ b/distinfo @@ -1,2 +1,2 @@ -SHA256 (mongodb-src-r2.6.4.tar.gz) = B1QRpWD123QHAyuWLrtdoWoMypNuqCp9JkOUtNjLmcA= -SIZE (mongodb-src-r2.6.4.tar.gz) = 14491215 +SHA256 (mongodb-src-r3.2.6.tar.gz) = BBWptQP2LkDSuof1VbVTdXoU+sKB0dalg9jYgLhyCSE= +SIZE (mongodb-src-r3.2.6.tar.gz) = 29750170 diff --git a/files/mongodb.conf b/files/mongodb.conf index 004a41e..fb7703d 100644 --- a/files/mongodb.conf +++ b/files/mongodb.conf @@ -1,23 +1,20 @@ # $OpenBSD: mongodb.conf,v 1.1.1.1 2011/06/02 00:26:32 fgsch Exp $ -# Sample configuration. See mongod --help for more
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2016/05/05 16:46:27 Modified files: databases/ruby-mysql2: Makefile distinfo databases/ruby-mysql2/pkg: PLIST Removed files: databases/ruby-mysql2/patches: patch-ext_mysql2_extconf_rb Log message: Update to mysql2 0.4.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2016/05/05 16:45:39 Modified files: databases/ruby-tiny_tds: Makefile distinfo databases/ruby-tiny_tds/patches: patch-_metadata patch-ext_tiny_tds_extconf_rb databases/ruby-tiny_tds/pkg: PLIST Log message: Update to tiny_tds 1.0.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/05/05 01:59:33 Modified files: sysutils/google-cloud-sdk: Makefile distinfo sysutils/google-cloud-sdk/pkg: PLIST Log message: Update to google-cloud-sdk-108.0.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/05/05 02:25:31 Modified files: print/hplip: Makefile distinfo print/hplip/patches: patch-Makefile_in patch-base_codes_py patch-base_queues_py patch-base_utils_py patch-check_py patch-configure patch-installer_core_install_py patch-installer_dcheck_py patch-setup_py print/hplip/pkg: PLIST-hpijs Log message: Update to hplip-3.16.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/05/05 03:02:46 Modified files: textproc/mupdf : Makefile textproc/mupdf/patches: patch-platform_x11_pdfapp_c Log message: support https URLs with mupdf-x11-curl, from jirib at devio.us
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/05/05 03:31:41 Modified files: x11/gnome/builder: Makefile distinfo Removed files: x11/gnome/builder/patches: patch-libide_Makefile_in patch-libide_ide-source-view_c patch-libide_ide-uri_c patch-libide_ide-workbench-actions_c patch-libide_ide_h Log message: Merge a few patches from upstream to fix a crasher.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/05/05 00:53:19 Modified files: www/mozilla-firefox: Makefile distinfo www/firefox-i18n: Makefile.inc distinfo Log message: Bugfix update to firefox 46.0.1. - See https://www.mozilla.org/en-US/firefox/46.0.1/releasenotes/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/05/05 01:53:02 Modified files: devel/py-ioflo : Makefile distinfo devel/py-ioflo/pkg: PLIST Log message: Update to devel/py-ioflo.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2016/05/05 06:33:54 Removed files: devel/py-texscythe/patches: patch-texscyther Log message: py-texscythe: forgot to 'cvs rm' this patch in the last updated. OK abieber@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: czark...@cvs.openbsd.org2016/05/05 04:46:50 Modified files: lang/go: Makefile go.port.mk lang/go-bootstrap: Makefile net/syncthing : Makefile sysutils/terraform: Makefile Log message: Set INSTALL_STRIP= for go ports OK ajacoutot@, sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/05/05 08:14:45 Modified files: security/pecl-libsodium: Makefile distinfo Log message: update to pecl-libsodium-1.0.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/05/05 13:55:12 Removed files: x11/openmotif : Makefile distinfo x11/openmotif/patches: patch-Imakefile patch-Makefile_imake-pure patch-autogen_sh patch-bindings-Imakefile patch-bitmaps-Imakefile patch-clients_mwm_WmFunction_c patch-clients_uil_UilDefI_h patch-config-Imakefile patch-config-cf-Imakefile patch-config-imake-Imakefile patch-config-makedepend-Imakefile patch-config-util-Imakefile patch-config_cf_Motif_rules patch-config_cf_Motif_tmpl patch-config_cf_bsdLib_tmpl patch-config_cf_host_def patch-config_cf_site_def patch-demos_lib_Exm_wml_Makefile_am patch-demos_programs_Imakefile patch-demos_programs_workspace_wsmData_c patch-demos_programs_workspace_xrmLib_c patch-demos_unsupported_motifshell_motifshell_c patch-demos_unsupported_xmform_xmform_c patch-doc_man_man3_XmDisplay_3 patch-doc_man_man5_UIL_5 patch-lib_Xm_Scale_c patch-lib_Xm_Xmos_r_h patch-lib_Xm_XpmI_h patch-lib_Xm_Xpmcreate_c patch-lib_Xm_Xpmparse_c patch-tools_wml_Makefile_am x11/openmotif/pkg: DESCR-demos DESCR-main PLIST-demos PLIST-main Log message: remove x11/openmotif, replaced by x11/motif
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/05/05 13:58:37 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: openmotif -> motif
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/05/05 13:33:08 Log message: Re-import Motif 2.3.5, the industry standard user interface toolkit for the X Window System. Little remains of the previous x11/openmotif port. ok jasper@ Status: Vendor Tag: naddy Release Tags: naddy_20160505 N ports/x11/motif/Makefile N ports/x11/motif/distinfo N ports/x11/motif/patches/patch-doc_man_man3_XmDisplay_3 N ports/x11/motif/patches/patch-config_cf_Motif_tmpl N ports/x11/motif/patches/patch-demos_programs_workspace_xrmLib_c N ports/x11/motif/patches/patch-demos_unsupported_xmform_xmform_c N ports/x11/motif/patches/patch-doc_man_man5_UIL_5 N ports/x11/motif/patches/patch-lib_Xm_ColorS_c N ports/x11/motif/patches/patch-lib_Xm_TextF_c N ports/x11/motif/patches/patch-lib_Xm_XpmI_h N ports/x11/motif/pkg/DESCR N ports/x11/motif/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/05/05 13:52:29 Modified files: astro/xephem : Makefile audio/xmcd : Makefile comms/xastir : Makefile devel/ddd : Makefile editors/nedit : Makefile editors/ted: Makefile editors/vim: Makefile games/sudoku-solver: Makefile games/xminehunter: Makefile graphics/geomview: Makefile math/grace : Makefile misc/plan : Makefile misc/xtar : Makefile productivity/xinvest: Makefile productivity/xquote: Makefile sysutils/xps : Makefile textproc/mgdiff: Makefile textproc/xpdf : Makefile x11: Makefile x11/mxconns: Makefile x11/xbae : Makefile x11/xruskb : Makefile Log message: x11/openmotif -> x11/motif
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/05/05 15:44:55 Modified files: devel/yasm : Makefile Log message: replace gettext module
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2016/05/05 21:50:40 Modified files: x11/spectrwm : Makefile distinfo Log message: Update for Spectrwm to 3.0.1 *Fix makefile for non-Bitrig OS' *Redraw the focus window frame when changing regions with the pointer #126 *Prepend SWM_LIB to LD_PRELOAD instead of clobbering #124
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/05/05 23:53:02 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py-botocore-1.4.17.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/05/05 23:53:24 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.10.26.