Re: [UPDATE] x11/girara 0.2.5->0.2.6
On Fri, 10 Jun 2016 04:24:08 +0200 Jakub Skrzypnik wrote: > ok? " skrzyp: cool, good job. one thing i'll mention is that "ok?" makes it sound like you have commit access" Just what blakkheim said, I don't have access to the cvs, but I took that line a kind of folklor here, but while it looks like something more official, I should say sorry for any misleading. -- Jakub Skrzypnik
[UPDATE] x11/girara 0.2.5->0.2.6
Hi
My first contribution into /usr/ports after infamous x11/mpv port.
Updates x11/girara to 0.2.6, fixes bug which caused to show ugly black
bars around window in x11/zathura (or any other program using it) and
made reading PDFs uncomfortable.
Makefile patch were also removed, because I couldn't find what to patch
there again, seems like upstream fixed that issue too.
cc ajacoutot@
ok?Index: Makefile
===
RCS file: /cvs/ports/x11/girara/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 30 Dec 2015 09:56:28 - 1.6
+++ Makefile 10 Jun 2016 02:10:12 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.6 2015/12/30 09:56:28 ajacoutot Exp $
COMMENT = user interface library from pwmt
-DISTNAME = girara-0.2.5
+DISTNAME = girara-0.2.6
SHARED_LIBS += girara-gtk3 0.1 # 2.3
Index: distinfo
===
RCS file: /cvs/ports/x11/girara/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 30 Dec 2015 09:56:28 - 1.4
+++ distinfo 10 Jun 2016 02:10:12 -
@@ -1,2 +1,2 @@
-SHA256 (girara-0.2.5.tar.gz) = XPTy0EQ4Wxie2OnvyuhTLbHy1jokCh4ibzSRyZarqJI=
-SIZE (girara-0.2.5.tar.gz) = 75215
+SHA256 (girara-0.2.6.tar.gz) = 66abNSK00UngbRM95Sh3kTJ1hzxQWZP60ItteITsmg8=
+SIZE (girara-0.2.6.tar.gz) = 75841
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 30 Dec 2015 09:56:28 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,27 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2015/12/30 09:56:28 ajacoutot Exp $
-
-Create libs with a correct soname.
-Don't symlink libs.
-
Makefile.orig Mon Dec 21 11:13:39 2015
-+++ Makefile Wed Dec 30 10:50:28 2015
-@@ -118,7 +118,7 @@ ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.a: ${OBJEC
- ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.so.${SOVERSION}: ${OBJECTS}
- $(call colorecho,LD,$@)
- @mkdir -p ${BUILDDIR_RELEASE}/${BINDIR}
-- $(QUIET)${CC} -Wl,${SONAME_FLAG},lib${PROJECT}.so.${SOMAJOR} \
-+ $(QUIET)${CC} -Wl,${SONAME_FLAG},lib${PROJECT}.so.${SOVERSION} \
- ${SHARED_FLAG} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
-
- ${PROJECT}: static shared
-@@ -250,10 +250,6 @@ install-shared: shared
- $(call colorecho,INSTALL,"Install shared library")
- $(QUIET)mkdir -m 755 -p ${DESTDIR}${LIBDIR}
- $(QUIET)install -m 644 ${BUILDDIR_RELEASE}/${BINDIR}/lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}
-- $(QUIET)ln -sf lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}/lib${PROJECT}.so.${SOMAJOR} || \
-- echo "Failed to create lib${PROJECT}.so.${SOMAJOR}. Please check if it exists and points to the correct version of lib${PROJECT}.so."
-- $(QUIET)ln -sf lib${PROJECT}.so.${SOVERSION} ${DESTDIR}${LIBDIR}/lib${PROJECT}.so || \
-- echo "Failed to create lib${PROJECT}.so. Please check if it exists and points to the correct version of lib${PROJECT}.so."
-
- install-headers: ${PROJECTNV}/version.h ${BUILDDIR}/${PROJECT}.pc
- $(call colorecho,INSTALL,"Install pkg-config file")
UPDATE: lang/nim 0.14.2
Comments? OKs?
Index: Makefile
===
RCS file: /cvs/ports/lang/nim/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile22 Dec 2015 19:40:48 - 1.2
+++ Makefile10 Jun 2016 01:06:14 -
@@ -4,9 +4,8 @@ ONLY_FOR_ARCHS =i386 amd64
COMMENT = statically typed, imperative programming language
-VERSION = 0.11.2
+VERSION = 0.14.2
DISTNAME = nim-${VERSION}
-REVISION = 0
EXTRACT_SUFX = .tar.xz
CATEGORIES = lang
@@ -19,12 +18,23 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c m
+post-patch:
+ mkdir -p ${WRKSRC}/nimcache-port
+ mkdir -p ${WRKSRC}/nimcache-port-test
+ perl -i -pe "s#NIM_PORT_PATH#${PATH}#" ${WRKSRC}/koch.nim
+ perl -i -pe "s#NIM_PORT_CACHE#${WRKSRC}/nimcache-port-test#" \
+ ${WRKSRC}/koch.nim
+
do-build:
- cd ${WRKDIST} && ${SETENV} CC="${CC}" LINKER="${CC}" \
- COMP_FLAGS="${CFLAGS}" sh build.sh
+ cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \
+ CFLAGS="${CFLAGS}" sh build.sh
# slow machines can get a head of themselves and fail to link
- cd ${WRKSRC} && ${SETENV} bin/nim c --parallelBuild:1 koch
- cd ${WRKSRC} && ${SETENV} ./koch boot -d:release --parallelBuild:1
+ cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:1 \
+ --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
+ --listCmd --putenv:"PATH=${PATH}" koch
+ cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \
+ --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
+ --listCmd --putenv:"PATH=${PATH}"
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
@@ -38,6 +48,9 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim
do-test:
- cd ${WRKSRC} && ${SETENV} ./koch test all -d:release --parallelBuild:1
+ cd ${WRKSRC} && ${SETENV} ./koch test all -d:release \
+ --parallelBuild:1 --listFullPaths --listCmd \
+ --nimcache:"${WRKSRC}/nimcache-port-test" \
+ --putenv:"PATH=${PATH}"
.include
Index: distinfo
===
RCS file: /cvs/ports/lang/nim/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo19 Oct 2015 21:50:14 - 1.1.1.1
+++ distinfo10 Jun 2016 01:06:14 -
@@ -1,2 +1,2 @@
-SHA256 (nim-0.11.2.tar.xz) = VkDjZNi6zsgw8Bba89RCeRHEjOv5YnJOyQP+pdWnpBk=
-SIZE (nim-0.11.2.tar.xz) = 2587012
+SHA256 (nim-0.14.2.tar.xz) = Iryzjgru14n+jrmEB+cDc2X+uczY+k45oEZHJsW38vs=
+SIZE (nim-0.14.2.tar.xz) = 6462864
Index: patches/patch-build_sh
===
RCS file: /cvs/ports/lang/nim/patches/patch-build_sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-build_sh
--- patches/patch-build_sh 19 Oct 2015 21:50:14 - 1.1.1.1
+++ patches/patch-build_sh 10 Jun 2016 01:06:14 -
@@ -1,16 +1,16 @@
$OpenBSD: patch-build_sh,v 1.1.1.1 2015/10/19 21:50:14 juanfra Exp $
build.sh.orig Sun Sep 13 00:49:57 2015
-+++ build.sh Sun Sep 13 00:52:17 2015
+--- build.sh.orig Tue Jun 7 00:38:53 2016
build.sh Thu Jun 9 19:43:03 2016
@@ -26,9 +26,9 @@ do
esac
done
-CC="gcc"
-LINKER="gcc"
--COMP_FLAGS="-w -O3 -fno-strict-aliasing$extraBuildArgs"
+-COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3
-fno-strict-aliasing$extraBuildArgs"
+#CC="gcc"
+#LINKER="gcc"
-+COMP_FLAGS="-w -fno-strict-aliasing$extraBuildArgs $COMP_FLAGS"
- LINK_FLAGS=""
++COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fno-strict-aliasing$extraBuildArgs"
+ LINK_FLAGS="${LDFLAGS:-} "
+ PS4=""
# platform detection
- ucpu=`uname -m`
Index: patches/patch-compiler_extccomp_nim
===
RCS file: /cvs/ports/lang/nim/patches/patch-compiler_extccomp_nim,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-compiler_extccomp_nim
--- patches/patch-compiler_extccomp_nim 19 Oct 2015 21:50:14 - 1.1.1.1
+++ patches/patch-compiler_extccomp_nim 10 Jun 2016 01:06:14 -
@@ -1,16 +1,16 @@
$OpenBSD: patch-compiler_extccomp_nim,v 1.1.1.1 2015/10/19 21:50:14 juanfra
Exp $
compiler/extccomp.nim.orig Sun Sep 13 00:55:21 2015
-+++ compiler/extccomp.nim Sun Sep 13 01:01:06 2015
-@@ -18,7 +18,7 @@ import
+--- compiler/extccomp.nim.orig Tue Jun 7 00:38:57 2016
compiler/extccomp.nim Thu Jun 9 19:46:54 2016
+@@ -21,7 +21,7 @@ from debuginfo import writeDebugInfo
type
TSystemCC* = enum
ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
--ccTcc, ccPcc, ccUcc, ccIcl
-+ccTcc, ccPcc, ccUcc, ccIcl, ccEGcc
+-ccTcc, ccPcc, ccUcc, ccIcl, asmFasm
++ccTcc, ccPcc, ccUcc, ccIcl, asmFasm, ccEGcc
TInfoCCPr
NEW: textproc/fragistics
Hi ports@ $ cat pkg/DESCR Fragistics is a Quake3 statistics program. It generates several webpages containing statistics about the games played from the games.log generated by a Quake3:Arena server. Some example output form the upcoming port: - https://imgur.com/pbqlhof - https://imgur.com/EjXrgb4 - https://imgur.com/SGDOT6f This ports needs the recently submitted devel/p5-Shell port. Regards, Adam fragistics.tar.gz Description: application/gzip
Re: NEW: sysutils/vifm
Rafael Sadowski said:
> here is a third and last try to push vifm in ports tree.
Now that we have pledge(2), it would probably be a better idea to use
libmagic with fork+pledge.
| + /* replace single quotes with double */
| + if (strchr(filename, '\''))
| {
| - return -1;
| + qp = quoted_filename;
| +
| + do {
| + if (*filename == '\'')
| + *qp++ = '\\';
| + *qp++ = *filename;
| + } while (*filename++ != '\0');
| +
| + filename = quoted_filename;
| }
This is not needed. And even if it was, comment should have been
different.
| + switch (fork())
| {
| - pclose(pipe);
| - return -1;
| + case -1:
| + printf("ERROR: forking child process failed\n");
| + return -1;
| + case 0:
| + dup2 (pipes[1], STDOUT_FILENO);
| + close(pipes[0]);
| + close(pipes[1]);
| + /* Use the file command to get mimetype */
| + execl("/usr/bin/file", "file", "-b", "--mime-type",
filename);
| + exit(0);
| + default:
| + close(pipes[1]);
| + (void)read(pipes[0], buf, buf_sz);
Shouldn't the parent process wait(2) for child?
--
Dmitrij D. Czarkoff
Re: python 3 only with django
On 9 Jun 2016, at 18:22, frantisek holop wrote: > not to be a dick, but python2 django should be removed > when django removes python2 support. exactly. devin -- contact info: https://nacredata.com/devin
Re: python 3 only with django
Remi Pointel, 09 Jun 2016 21:51: > Hi, > > I would like to have python 3 only with django (lts and "stable" version). why? python2 django is going nowhere for a looong time. not all of the django ecosystem is python3 ready by far, what are you trying to accomplish? not to be a dick, but python2 django should be removed when django removes python2 support. -f -- is that a banana in your pocket, or you happy to see me?
NEW: devel/p5-Shell
Hi ports@, This is a new p5 dependency for an upcoming quake 3 stats parser port. Some example output form the upcoming port: - https://imgur.com/pbqlhof - https://imgur.com/EjXrgb4 $ cat p5-Shell/pkg/DESCR Shell - run shell commands transparently within perl Regards, Adam p5-Shell.tar.gz Description: application/gzip
Re: NEW: sysutils/vifm
On 2016/06/09 20:39, Landry Breuil wrote: > So, fwiw, the attached version is ok for me to import - stuff can still > be fixed in-tree if more issues arise. Let's stop the bikeshedding, and > thank Rafael for his perseverance. Kill the patch.orig and OK with me. Though the desktop-file-utils dep for no_x11 is pretty horrible, I think that should be made conditional and move the @exec to a PFRAG, but that could be done after it's in..
[NEW] devel/dex2jar
Hi, attached is the new port dex2jar: -- $ pkg_info dex2jar Information for inst:dex2jar-2.0 Comment: tools to work with android .dex and java .class files Description: dex2jar contains following compment * dex-reader is designed to read the Dalvik Executable (.dex/.odex) format. It has a light weight API similar with ASM. * dex-translator is designed to do the convert job. It reads the dex instruction to dex-ir format, after some optimize, convert to ASM format. * dex-ir used by dex-translator, is designed to represent the dex instruction dex-tools tools to work with .class files. * d2j-smali disassemble dex to smali files and assemble dex from smali files. different implementation to smali/baksmali, same syntax, but we support escape in type desc "Lcom/dex2jar\t\u1234;" * dex-writer write dex same way as dex-reader. Maintainer: Remi Pointel WWW: https://github.com/pxb1988/dex2jar -- Ok? Cheers, Remi. dex2jar.tar.gz Description: application/gzip
Re: NEW: sysutils/vifm
On Wed, Jun 08, 2016 at 11:00:21PM +0200, Rafael Sadowski wrote: > On Wed Jun 08, 2016 at 09:34:50PM +0200, Landry Breuil wrote: > > On Tue, Jun 07, 2016 at 09:28:37PM +0200, Rafael Sadowski wrote: > > > Hi ports@ and vifm friends, > > > > > > here is a third and last try to push vifm in ports tree. > > > > > > port core features: > > > - The same as: http://marc.info/?l=openbsd-ports&m=145647165914163&w=2 > > > - new: remove popen(2) call and replace with fork(2)(execl(3) > > > > > > pkg/DESCR: > > > > > > Vifm is a two panel ncurses based vi[m] like file manager. If you use vi, > > > vifm gives you complete keyboard control over your files without having > > > to learn a new set of commands. It goes not just about vi[m] like > > > keybindings, but also about modes, options, registers, commands and > > > other things you might already like in vi[m]. > > > > > > OK, Comments? > > > > Has all the failure/risky cases that were reported in the last thread > > tested/taken care of now ? > > > > Landry > > Of course, I fixed all failure/risky cases and yes I tested it well. I > would have thought that was patently obvious. I'll send fork/execl > replacement patch upstream. Here's a slightly modified version of your patch to fix warnings: /usr/obj/tmpfs/ports/vifm-0.8.1a/vifm-0.8.1a/src/int/file_magic.c:181: warning: missing sentinel in function call /usr/obj/tmpfs/ports/vifm-0.8.1a/vifm-0.8.1a/src/int/file_magic.c:182: warning: implicit declaration of function 'exit' /usr/obj/tmpfs/ports/vifm-0.8.1a/vifm-0.8.1a/src/int/file_magic.c:182: warning: incompatible implicit declaration of built-in function 'exit' - include stdlib.h for exit() - remove unused char command declaration - add NULL sentinel as last arg of execl() I've tested it a bit, with a file named "echo 'foo' > bar" in /tmp, no ill effect. But that was with the default gtk backend, and it allows me to open the file in mousepad fine. With the no_x11 FLAVOR, it 'does the right thing' afaict. 30832 vifm ARGS [0] = "file" [1] = "-b" [2] = "--mime-type" [3] = "/tmp/echo \\'foo\\' > bar" And via enter, opens the file in vim. 61442 vifm ARGS [0] = "/bin/ksh" [1] = "-c" [2] = "vim /tmp/echo\\ \\'foo\\'\\ \\>\\ bar" 66333 ksh ARGS [0] = "vim" [1] = "/tmp/echo 'foo' > bar" Tested slightly with jpg and mp4 files, mimetype seems correctly found, i still have 'less' options to open the file than with the default flavor (check :f) but that's expected. So, fwiw, the attached version is ok for me to import - stuff can still be fixed in-tree if more issues arise. Let's stop the bikeshedding, and thank Rafael for his perseverance. Landry vifm2.tgz Description: application/tar-gz
[NEW] devel/jd-gui
Hi, attached is the tarball for the port jd-gui, a standalone Java Decompiler GUI. - $ pkg_info jd-gui Information for inst:jd-gui-1.4.0 Comment: yet another fast Java decompiler Description: A standalone Java Decompiler GUI. Maintainer: Remi Pointel WWW: http://jd.benow.ca/ - Ok? Cheers, Remi. jd-gui.tar.gz Description: application/gzip
Re: UPDATE: mail/msmtp-1.6.5
On Wed, Jun 08, 2016 at 11:40:33PM -0300, Gleydson Soares wrote: > This release supports SHA256 fingerprints for tls_fingerprint, and > mark both SHA1 and MD5 as deprecated. Works for me. Upgraded my old SHA1 fingerprint to SHA256 with no issues. Also changed one character and checked the check failed. It did. OK edd@ -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: patch for net/netatalk and net/netatalk3
Sorry, wrong patch. Here's the correct one:
diff -x CVS -rNu net/netatalk3.orig/Makefile net/netatalk3/Makefile
--- net/netatalk3.orig/Makefile Sun Mar 20 17:12:25 2016
+++ net/netatalk3/Makefile Thu Jun 9 16:14:06 2016
@@ -3,7 +3,7 @@
COMMENT= AFP file and print services for IP networks
V= 3.1.8
-REVISION= 0
+REVISION= 1
DISTNAME= netatalk-${V}
EXTRACT_SUFX= .tar.bz2
PKGSPEC = netatalk->=3,<4
diff -x CVS -rNu net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_c
net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c
--- net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_cThu Jan
1 01:00:00 1970
+++ net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c Thu Jun 9
16:08:04 2016
@@ -0,0 +1,26 @@
+$OpenBSD$
+--- etc/uams/uams_dhx2_passwd.c.orig Thu Jun 9 15:55:58 2016
etc/uams/uams_dhx2_passwd.cThu Jun 9 15:59:50 2016
+@@ -545,12 +545,21 @@ static int logincont2(void *obj _U_, struct passwd **u
+ /* Start authentication --- */
+ ret = AFPERR_NOTAUTH;
+
++if ((dhxpwd = getpwnam_shadow(dhxpwd->pw_name)) == NULL) {
++LOG(log_info, logtype_uams,
++ "could not get shadow passwd for %s", dhxpwd->pw_name);
++ret = AFPERR_NOTAUTH;
++goto exit;
++}
++
+ p = crypt( ibuf, dhxpwd->pw_passwd );
+ memset(ibuf, 0, 255);
+-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) {
++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) {
++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd));
+ *uam_pwd = dhxpwd;
+ ret = AFP_OK;
+ }
++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd));
+
+ #ifdef SHADOWPW
+ if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) {
diff -x CVS -rNu net/netatalk3.orig/patches/patch-etc_uams_uams_dhx_passwd_c
net/netatalk3/patches/patch-etc_uams_uams_dhx_passwd_c
--- net/netatalk3.orig/patches/patch-etc_uams_uams_dhx_passwd_c Thu Jan 1
01:00:00 1970
+++ net/netatalk3/patches/patch-etc_uams_uams_dhx_passwd_c Thu Jun 9
16:11:20 2016
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- etc/uams/uams_dhx_passwd.c.origThu Jun 9 15:59:59 2016
etc/uams/uams_dhx_passwd.c Thu Jun 9 16:11:14 2016
+@@ -342,12 +342,20 @@ static int passwd_logincont(void *obj, struct passwd *
+ return AFP_OK;
+ }
+ #else /* TRU64 */
++if ((dhxpwd = getpwnam_shadow(dhxpwd->pw_name)) == NULL) {
++LOG(log_info, logtype_uams,
++ "could not get shadow passwd for %s", dhxpwd->pw_name);
++ return (AFPERR_NOTAUTH);
++}
++
+ p = crypt( rbuf, dhxpwd->pw_passwd );
+ memset(rbuf, 0, PASSWDLEN);
+-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) {
++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) {
++ memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd));
+ *uam_pwd = dhxpwd;
+ err = AFP_OK;
+ }
++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd));
+ #ifdef SHADOWPW
+ if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) {
+ LOG(log_info, logtype_uams, "no shadow passwd entry for %s",
dhxpwd->pw_name);
diff -x CVS -rNu net/netatalk3.orig/patches/patch-etc_uams_uams_passwd_c
net/netatalk3/patches/patch-etc_uams_uams_passwd_c
--- net/netatalk3.orig/patches/patch-etc_uams_uams_passwd_c Thu Jan 1
01:00:00 1970
+++ net/netatalk3/patches/patch-etc_uams_uams_passwd_c Thu Jun 9 17:36:08 2016
@@ -0,0 +1,37 @@
+$OpenBSD$
+--- etc/uams/uams_passwd.c.origThu Dec 11 12:27:44 2014
etc/uams/uams_passwd.c Thu Jun 9 17:34:40 2016
+@@ -229,11 +229,19 @@ static int passwd_changepw(void *obj, char *username,
+ pwd->pw_passwd = sp->sp_pwdp;
+ #endif /* SHADOWPW */
+
++if ((pwd = getpwnam_shadow(pwd->pw_name)) == NULL) {
++LOG(log_info, logtype_uams,
++ "could not get shadow passwd for %s", pwd->pw_name);
++ret = AFPERR_NOTAUTH;
++goto exit;
++}
++
+ p = crypt(pw, pwd->pw_passwd );
+-if (strcmp( p, pwd->pw_passwd )) {
++if ((p == NULL) || strcmp( p, pwd->pw_passwd ))) {
+ memset(pw, 0, sizeof(pw));
+ return AFPERR_NOTAUTH;
+ }
++memset(pwd->pw_passwd, 0, strlen(pwd->pw_passwd));
+
+ /* new password */
+ ibuf += PASSWDLEN;
+@@ -329,6 +337,12 @@ static int passwd_printer(char*start, char *stop, cha
+ }
+
+ #endif /* SHADOWPW */
++
++if ((pwd = getpwnam_shadow(pwd->pw_name)) == NULL) {
++LOG(log_info, logtype_uams,
++ "could not get shadow passwd for %s", pwd->pw_name);
++return(-1);
++}
+
+ if (!pwd->pw_passwd) {
+ LOG(log_info, logtype_uams, "Bad Login ClearTxtUAM: no password for
%s",
Re: patch for net/netatalk and net/netatalk3
I had another look at the netatalk3 port and came up with the
following patch. It works for me but that's not a thorough test
(and only for dhx2). It's a more invasive patch than my previous
one, but if this is better I can apply the same to net/netatalk.
I looked for the SHADOWPW ifdefs and added an additional
getpwnam_shadow(3) call in front of the crypt(3) calls (and one
additional one to the clear text pw check). I also memset the
pw_passwd fields to 0 and added check for crypt(3) returning NULL.
FWIW, here's the patch:
diff -x CVS -rNu net/netatalk3.orig/Makefile net/netatalk3/Makefile
--- net/netatalk3.orig/Makefile Sun Mar 20 17:12:25 2016
+++ net/netatalk3/Makefile Thu Jun 9 16:14:06 2016
@@ -3,7 +3,7 @@
COMMENT= AFP file and print services for IP networks
V= 3.1.8
-REVISION= 0
+REVISION= 1
DISTNAME= netatalk-${V}
EXTRACT_SUFX= .tar.bz2
PKGSPEC = netatalk->=3,<4
diff -x CVS -rNu net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_c
net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c
--- net/netatalk3.orig/patches/patch-etc_uams_uams_dhx2_passwd_cThu Jan
1 01:00:00 1970
+++ net/netatalk3/patches/patch-etc_uams_uams_dhx2_passwd_c Thu Jun 9
16:08:04 2016
@@ -0,0 +1,26 @@
+$OpenBSD$
+--- etc/uams/uams_dhx2_passwd.c.orig Thu Jun 9 15:55:58 2016
etc/uams/uams_dhx2_passwd.cThu Jun 9 15:59:50 2016
+@@ -545,12 +545,21 @@ static int logincont2(void *obj _U_, struct passwd **u
+ /* Start authentication --- */
+ ret = AFPERR_NOTAUTH;
+
++if ((dhxpwd = getpwnam_shadow(dhxpwd->pw_name)) == NULL) {
++LOG(log_info, logtype_uams,
++ "could not get shadow passwd for %s", dhxpwd->pw_name);
++ret = AFPERR_NOTAUTH;
++goto exit;
++}
++
+ p = crypt( ibuf, dhxpwd->pw_passwd );
+ memset(ibuf, 0, 255);
+-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) {
++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) {
++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd));
+ *uam_pwd = dhxpwd;
+ ret = AFP_OK;
+ }
++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd));
+
+ #ifdef SHADOWPW
+ if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) {
diff -x CVS -rNu net/netatalk3.orig/patches/patch-etc_uams_uams_dhx_passwd_c
net/netatalk3/patches/patch-etc_uams_uams_dhx_passwd_c
--- net/netatalk3.orig/patches/patch-etc_uams_uams_dhx_passwd_c Thu Jan 1
01:00:00 1970
+++ net/netatalk3/patches/patch-etc_uams_uams_dhx_passwd_c Thu Jun 9
16:11:20 2016
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- etc/uams/uams_dhx_passwd.c.origThu Jun 9 15:59:59 2016
etc/uams/uams_dhx_passwd.c Thu Jun 9 16:11:14 2016
+@@ -342,12 +342,20 @@ static int passwd_logincont(void *obj, struct passwd *
+ return AFP_OK;
+ }
+ #else /* TRU64 */
++if ((dhxpwd = getpwnam_shadow(dhxpwd->pw_name)) == NULL) {
++LOG(log_info, logtype_uams,
++ "could not get shadow passwd for %s", dhxpwd->pw_name);
++ return (AFPERR_NOTAUTH);
++}
++
+ p = crypt( rbuf, dhxpwd->pw_passwd );
+ memset(rbuf, 0, PASSWDLEN);
+-if ( strcmp( p, dhxpwd->pw_passwd ) == 0 ) {
++if ( (p != NULL) && (strcmp( p, dhxpwd->pw_passwd ) == 0) ) {
++ memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd));
+ *uam_pwd = dhxpwd;
+ err = AFP_OK;
+ }
++memset(dhxpwd->pw_passwd, 0, strlen(dhxpwd->pw_passwd));
+ #ifdef SHADOWPW
+ if (( sp = getspnam( dhxpwd->pw_name )) == NULL ) {
+ LOG(log_info, logtype_uams, "no shadow passwd entry for %s",
dhxpwd->pw_name);
diff -x CVS -rNu net/netatalk3.orig/patches/patch-etc_uams_uams_passwd_c
net/netatalk3/patches/patch-etc_uams_uams_passwd_c
--- net/netatalk3.orig/patches/patch-etc_uams_uams_passwd_c Thu Jan 1
01:00:00 1970
+++ net/netatalk3/patches/patch-etc_uams_uams_passwd_c Thu Jun 9 16:29:47 2016
@@ -0,0 +1,37 @@
+$OpenBSD$
+--- etc/uams/uams_passwd.c.origThu Dec 11 12:27:44 2014
etc/uams/uams_passwd.c Thu Jun 9 16:29:16 2016
+@@ -229,11 +229,19 @@ static int passwd_changepw(void *obj, char *username,
+ pwd->pw_passwd = sp->sp_pwdp;
+ #endif /* SHADOWPW */
+
++if ((pwd = getpwnam_shadow(pwd->pw_name)) == NULL) {
++LOG(log_info, logtype_uams,
++ "could not get shadow passwd for %s", pwd->pw_name);
++ret = AFPERR_NOTAUTH;
++goto exit;
++}
++
+ p = crypt(pw, pwd->pw_passwd );
+-if (strcmp( p, pwd->pw_passwd )) {
++if ((p != NULL) && strcmp( p, pwd->pw_passwd ))) {
+ memset(pw, 0, sizeof(pw));
+ return AFPERR_NOTAUTH;
+ }
++memset(pwd->pw_passwd, 0, strlen(pwd->pw_passwd));
+
+ /* new password */
+ ibuf += PASSWDLEN;
+@@ -329,6 +337,12 @@ static int passwd_printer(char*start, char *stop, cha
+ }
+
+ #endif /* SHADOWPW */
++
++if ((pwd = getpwnam_shadow(pwd->pw_name)) == NULL) {
++
Re: patch for net/netatalk and net/netatalk3
It needs REVISION bumps then it's OK with me to unbreak things. But if someone has time to look a little deeper, it could be better targetted - there are only a few places that actually need the passwords (see the SHADOWPW ifdefs) so it could be changed to only use *_shadow functions in those places (though it can't directly use their code because that's for the getspnam API and struct spwd that other people use..) On 2016/06/09 14:43, Nils Frohberg wrote: > Due to lib/libc/gen/getpwent.c rev 1.61, netatalk segfaults when > authenticating via uam_dhx2_passwd.c (crypt(3)'s return value isn't > checked against NULL, cf. around line 551 of etc/afpd/uam.c). It > should now use getpwnam_shadow(3) instead of getpwnam(3) when looking > for the username and password. > > > The following patch fixes the port for my use case, I didn't look > for other getpwnam(3) calls. > > --- /dev/null Thu Jun 9 11:39:05 2016 > +++ net/netatalk/patches/patch-etc_afpd_uam_c Thu Jun 9 11:20:07 2016 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- etc/afpd/uam.c.orig Thu Jun 9 11:19:40 2016 > etc/afpd/uam.c Thu Jun 9 11:19:57 2016 > +@@ -227,7 +227,7 @@ struct passwd *uam_getname(void *private, char *name, > + char *p; > + size_t namelen, gecoslen = 0, pwnamelen = 0; > + > +-if ((pwent = getpwnam(name))) > ++if ((pwent = getpwnam_shadow(name))) > + return pwent; > + > + /* if we have a NT domain name try with it */ > --- /dev/null Thu Jun 9 14:37:49 2016 > +++ net/netatalk3/patches/patch-etc_afpd_uam_cThu Jun 9 12:07:41 2016 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- etc/afpd/uam.c.orig Thu Jun 9 12:07:15 2016 > etc/afpd/uam.c Thu Jun 9 12:07:26 2016 > +@@ -205,7 +205,7 @@ struct passwd *uam_getname(void *private, char *name, > + char *p; > + size_t namelen, gecoslen = 0, pwnamelen = 0; > + > +-if ((pwent = getpwnam(name))) > ++if ((pwent = getpwnam_shadow(name))) > + return pwent; > + > + /* if we have a NT domain name try with it */ >
Re: UPDATE: PowerDNS 3.4.9
anyone?
thanks,
florian
On Fri, Jun 03, 2016 at 12:48:59PM +, Florian Obser wrote:
> Works for me[tm]
>
> Changelog:
> https://doc.powerdns.com/md/changelog/#powerdns-authoritative-server-349
>
> OK?
>
> diff --git Makefile Makefile
> index 38b60f4..23a1ddf 100644
> --- Makefile
> +++ Makefile
> @@ -8,7 +8,7 @@ COMMENT-mysql=MySQL database access module
> for PowerDNS
> COMMENT-pgsql= PGSQL database access module for PowerDNS
> COMMENT-ldap=LDAP module for PowerDNS
>
> -V= 3.4.8
> +V= 3.4.9
> DISTNAME=pdns-${V}
> EXTRACT_SUFX = .tar.bz2
> PKGNAME= powerdns-${V}
> diff --git distinfo distinfo
> index c5f0359..8db5796 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (pdns-3.4.8.tar.bz2) = T4GP0Jv/iWJbQxfMfAVEX2572eqNIefu/qrKB7iwzZ8=
> -SIZE (pdns-3.4.8.tar.bz2) = 1345728
> +SHA256 (pdns-3.4.9.tar.bz2) = KxEk2y2TftZmZSW5/GCl3VXLgvTK5YEWy5ht5T+qXf8=
> +SIZE (pdns-3.4.9.tar.bz2) = 1351434
>
>
> --
> I'm not entirely sure you are real.
>
--
I'm not entirely sure you are real.
patch for net/netatalk and net/netatalk3
Due to lib/libc/gen/getpwent.c rev 1.61, netatalk segfaults when authenticating via uam_dhx2_passwd.c (crypt(3)'s return value isn't checked against NULL, cf. around line 551 of etc/afpd/uam.c). It should now use getpwnam_shadow(3) instead of getpwnam(3) when looking for the username and password. The following patch fixes the port for my use case, I didn't look for other getpwnam(3) calls. --- /dev/null Thu Jun 9 11:39:05 2016 +++ net/netatalk/patches/patch-etc_afpd_uam_c Thu Jun 9 11:20:07 2016 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- etc/afpd/uam.c.origThu Jun 9 11:19:40 2016 etc/afpd/uam.c Thu Jun 9 11:19:57 2016 +@@ -227,7 +227,7 @@ struct passwd *uam_getname(void *private, char *name, + char *p; + size_t namelen, gecoslen = 0, pwnamelen = 0; + +-if ((pwent = getpwnam(name))) ++if ((pwent = getpwnam_shadow(name))) + return pwent; + + /* if we have a NT domain name try with it */ --- /dev/null Thu Jun 9 14:37:49 2016 +++ net/netatalk3/patches/patch-etc_afpd_uam_c Thu Jun 9 12:07:41 2016 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- etc/afpd/uam.c.origThu Jun 9 12:07:15 2016 etc/afpd/uam.c Thu Jun 9 12:07:26 2016 +@@ -205,7 +205,7 @@ struct passwd *uam_getname(void *private, char *name, + char *p; + size_t namelen, gecoslen = 0, pwnamelen = 0; + +-if ((pwent = getpwnam(name))) ++if ((pwent = getpwnam_shadow(name))) + return pwent; + + /* if we have a NT domain name try with it */
Re: UPDATE: mail/msmtp-1.6.5
On Thu, Jun 9, 2016 at 4:40 AM, Gleydson Soares wrote: > update msmtp to 1.6.5. > > This release supports SHA256 fingerprints for tls_fingerprint, and > mark both SHA1 and MD5 as deprecated. > > OK? > > Index: Makefile > === > RCS file: /cvs/ports/mail/msmtp/Makefile,v > retrieving revision 1.42 > diff -u -p -r1.42 Makefile > --- Makefile27 Apr 2016 10:40:15 - 1.42 > +++ Makefile9 Jun 2016 02:36:20 - > @@ -2,7 +2,7 @@ > > COMMENT = SMTP plugin for MUAs > > -DISTNAME = msmtp-1.6.4 > +DISTNAME = msmtp-1.6.5 > CATEGORIES = mail > > HOMEPAGE = http://msmtp.sourceforge.net/ > Index: distinfo > === > RCS file: /cvs/ports/mail/msmtp/distinfo,v > retrieving revision 1.28 > diff -u -p -r1.28 distinfo > --- distinfo27 Apr 2016 10:40:15 - 1.28 > +++ distinfo9 Jun 2016 02:36:20 - > @@ -1,2 +1,2 @@ > -SHA256 (msmtp-1.6.4.tar.xz) = m0nAIqVEDUG2eCyX7yl30DRsPa4Fqog2JDqZU+mC0c0= > -SIZE (msmtp-1.6.4.tar.xz) = 282840 > +SHA256 (msmtp-1.6.5.tar.xz) = dqDWBpPH5l0MehLwHTAIgtKAseG+AgL1RzCuRNRKUAY= > +SIZE (msmtp-1.6.5.tar.xz) = 283284 > Works fine for me. ok dcoppa@ Ciao! David
