Re: NEW: sysutils/vifm
On Tue, Feb 02, 2016 at 05:09:34PM +0100, Tobias Ulmer wrote: > What's the point when it requires half of GNOME? You should call the > package gvifm... > > CONFIGURE_ARGS += --without-gtk --without-libmagic --without-X11 > --without-dyn-X11 As the one who originally ported vifm years ago, its code quality was not great, and at some point it got removed. Apparently upstream has now revived this software, has a new website, so why not giving it a chance again, especially if people seem to like it ? I've tested it briefly on macppc and it seemd to work. The gtk+2/libmagic/libX11 dependency, maybe it is a bit overkill (from configure.ac): [use GTK+ to determine mimetypes if available @<:@default=yes@:>@]), [use libmagic to determine mimetypes if available @<:@default=yes@:>@]), [use libX11 to determine terminal emulator title @<:@default=yes@:>@]),. [load libX11 dynamically @<:@default=yes@:>@]) @rafael: if you decide to keep gtk dependency, LIB_DEPENDS=x11/gtk+2 ought to be enough, no need to list pango/glib/atk/gdk_pxibuf. You didnt set CONFIGURE_ARGS so x11/libmagic will be picked up automatically if present at configure time. This will be an issue in bulks. > (libmagic is a security disaster waiting to happen in a file manager) sqlite> select distinct(fullpkgpath) from depends where dependspath like '%libmagic%'; audio/sox devel/py-libmagic devel/py-libmagic,python3 editors/tpad geo/viking graphics/qiv lang/classpath mail/amavisd-new,-main mail/zarafa/zarafa,-main misc/p5-File-LibMagic multimedia/mediatomb multimedia/mkvtoolnix multimedia/mkvtoolnix,no_x11 net/bro net/mldonkey net/nepenthes print/lyx security/yara/main sysutils/binwalk textproc/zathura/core www/xapian-omega x11/emelfm2 x11/gnome/file-roller Then i guess we have other issues here. Landry
Re: NEW: sysutils/vifm
On Tue, Feb 02, 2016 at 08:56:35PM +0100, Rafael Sadowski wrote: > On Tue Feb 02, 2016 at 05:09:34PM +0100, Tobias Ulmer wrote: > > What's the point when it requires half of GNOME? You should call the > > package gvifm... > > Is that my fault!? If you don't like, it don't use it. I'm NOT a vifm > developer. I only port for my friend Uwe. That's it! > > > > > CONFIGURE_ARGS += --without-gtk --without-libmagic --without-X11 > > --without-dyn-X11 > > That's not my line. I think that was a suggestion from tobias :) > > > > (libmagic is a security disaster waiting to happen in a file manager) > > I follow you but it's just a port and not base stuff. I see misc/screen > in the ports tree. In my opinion screen is creep but it's only my > personal opinion. > > Finale, Dmitrij D. Czarkoff starts a "no_x11" flavor. Thanks Dmitrij. > https://github.com/jasperla/openbsd-wip/commit/a755a173f7ff05c23ab6d999716a4fe4855a54bc Im not sure 'feature-set-wise' that it's worth adding the complexity of a FLAVOR. You're the maintainer, you decide, but since libmagic and gtk+2 are here for the same feature (mimetype checking) maybe have a look at the code and see how it works (fine or not). Either way, please explicitely list --with/--without in CONFIGURE_ARGS for clarity. Note that the dyn-x11 thing was apparently broken in github, they added the requirement for -ldl which doesnt make sense on OpenBSD. So please check that the feature actually works if you want to enable it Landry >
Re: NEW: sysutils/vifm
On Tue Feb 02, 2016 at 05:09:34PM +0100, Tobias Ulmer wrote: > What's the point when it requires half of GNOME? You should call the > package gvifm... Is that my fault!? If you don't like, it don't use it. I'm NOT a vifm developer. I only port for my friend Uwe. That's it! > > CONFIGURE_ARGS += --without-gtk --without-libmagic --without-X11 > --without-dyn-X11 That's not my line. > > (libmagic is a security disaster waiting to happen in a file manager) I follow you but it's just a port and not base stuff. I see misc/screen in the ports tree. In my opinion screen is creep but it's only my personal opinion. Finale, Dmitrij D. Czarkoff starts a "no_x11" flavor. Thanks Dmitrij. https://github.com/jasperla/openbsd-wip/commit/a755a173f7ff05c23ab6d999716a4fe4855a54bc Best regards, Rafael
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2016/02/02 13:23:10 Modified files: www/py-django/lts: Makefile distinfo www/py-django/lts/pkg: PLIST www/py-django/stable: Makefile distinfo www/py-django/stable/pkg: PLIST Log message: update django to 1.9.2 and 1.8.9. ok jasper@ benoit@
Re: [update] devel/codeblocks
Josh Grosse wrote: > On Fri, Jan 29, 2016 at 03:09:38PM +0100, Antoine Jacoutot wrote: > > On Fri, Jan 29, 2016 at 08:28:31AM -0500, Josh Grosse wrote: > > > Update to 16.01. Builds and runs on amd64, with ongoing testing in > > > progress. > > > > > > Significant app changes: 6 years of development in $WRKSRC/ChangeLog > > > > > > Significant port changes: > > > > > > * wxmathplot library added > > > * new dependency on devel/libtool for libtoolize and automake pre-patch > > > * assigning maintainership > > > * parallel build permitted > > > > Thanks, I'll take care of it. > > Thank you, Antoine, for taking the time to look at the proposed update. > > I've spent several hours testing on amd64. Unlike the old version 13.12, > I have not had *any* occurances of an abort on exit. I mentioned this to Josh, but it's probably worth sharing: using an extreme malloc.conf(5) like CFJSU often reliably exposes bugs like this.
jabberd out of date
It would seem that the current version of the jabberd package is 2.0, with a date of about May 2013. The latest release is 2.3.5. I installed the jabberd package on openBSD 5.8 and was experiencing some difficulties with the SSL certs. I would rather work with a more recent version before digging into problems. Would it be possible to have port for a more recent release?
Re: pledge textproc/the_silver_searcher
On Fri, Jan 29, 2016 at 04:13:20PM -0500, Michael McConville wrote: > Sorry for disappearing. > > Thanks for pointing out the VCS popen. Below is a draft that > incorporates your suggestions. Let me know if it's too fine-grained. My > thought was that it's ideal to drop exec as early as possible. > +1, works for me on amd64. Regards, Florian
Re: NEW: sysutils/vifm
Landry Breuil said: > Im not sure 'feature-set-wise' that it's worth adding the complexity of > a FLAVOR. Flavors were supposed to address the "half GNOME" issue. -- Dmitrij D. Czarkoff
Re: NEW: sysutils/vifm
On Tue, Feb 02, 2016 at 09:34:13PM +0100, Dmitrij D. Czarkoff wrote: > Landry Breuil said: > > Im not sure 'feature-set-wise' that it's worth adding the complexity of > > a FLAVOR. > > Flavors were supposed to address the "half GNOME" issue. Sure, but in that particular case it turned into 'do you want your mime detection to be done with gtk+ (bo gnome blooaaat) or with libmagic (bo full of security issues)' :) Honestly, try both implementations, figure out which one 'performs' better in termes of filetype detection, and choose the less worst :) or just disable the feature if it not used much/broken. Doing a FLAVOR for this is just overkill, as 99% of the users wont know which one to choose (shall we build both by default?), and expect a non-no_x11 flavor to have some kind of GUI.. Landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/02/02 14:58:32 Modified files: mail/amavisd-new/patches: patch-amavisd patch-amavisd_conf patch-amavisd_conf-default Log message: regen patches, no pkg change
Re: NEW: sysutils/vifm
> On Tue, Feb 02, 2016 at 05:09:34PM +0100, Tobias Ulmer wrote: > > (libmagic is a security disaster waiting to happen in a file manager) > On 2016/02/02 19:22, Landry Breuil wrote: > sqlite> select distinct(fullpkgpath) from depends where dependspath like > '%libmagic%'; [..] > mail/amavisd-new,-main Possible diff for amavisd-new below, I'm running it here, needs a bunch more testing though. > Then i guess we have other issues here. Yep, it takes time to chip away at them. Index: Makefile === RCS file: /cvs/ports/mail/amavisd-new/Makefile,v retrieving revision 1.40 diff -u -p -r1.40 Makefile --- Makefile15 Jul 2015 19:26:44 - 1.40 +++ Makefile2 Feb 2016 22:08:55 - @@ -9,7 +9,7 @@ PKGNAME-main= ${DISTNAME} PKGNAME-utils= amavisd-new-utils-${V} CATEGORIES=mail security -REVISION-main= 2 +REVISION-main= 3 REVISION-utils=2 HOMEPAGE= http://www.amavis.org/ Index: patches/patch-amavisd === RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd,v retrieving revision 1.12 diff -u -p -r1.12 patch-amavisd --- patches/patch-amavisd 2 Feb 2016 21:58:32 - 1.12 +++ patches/patch-amavisd 2 Feb 2016 22:08:55 - @@ -1,6 +1,18 @@ $OpenBSD: patch-amavisd,v 1.12 2016/02/02 21:58:32 sthen Exp $ + +Hunks 1, 3: Disable File::LibMagic in favour of safer file(1) from base. + --- amavisd.orig Sun Oct 26 00:06:00 2014 -+++ amavisdTue Feb 2 21:57:58 2016 amavisdTue Feb 2 22:08:33 2016 +@@ -12557,7 +12557,7 @@ sub after_chroot_init() { +grep(/\.pm\z/, keys %INC)) { + next if !grep($_ eq $m, qw(Amavis::Conf + Archive::Tar Archive::Zip Compress::Zlib Compress::Raw::Zlib +- Convert::TNEF Convert::UUlib File::LibMagic ++ Convert::TNEF Convert::UUlib + MIME::Entity MIME::Parser MIME::Tools Mail::Header Mail::Internet + Digest::MD5 Digest::SHA Digest::SHA1 Crypt::OpenSSL::RSA + Authen::SASL Authen::SASL::XS Authen::SASL::Cyrus Authen::SASL::Perl @@ -29847,7 +29847,7 @@ sub new_SpamAssassin_instance { # PREFIX=> '/usr/local', # DEF_RULES_DIR => '/usr/local/share/spamassassin', @@ -10,3 +22,21 @@ $OpenBSD: patch-amavisd,v 1.12 2016/02/0 #see Mail::SpamAssassin man page for other options }; if ($sa_version_num < 3.001005 && !defined $sa_args->{LOCAL_STATE_DIR}) +@@ -30595,17 +30595,8 @@ BEGIN { + import Amavis::Unpackers::NewFilename qw(consumed_bytes); + } + +-BEGIN { + use vars qw($filemagic); +- eval { +-require File::LibMagic; +-File::LibMagic->VERSION(1.00); +-import File::LibMagic; +-$filemagic = File::LibMagic->new; +- } or do { + undef $filemagic; +- }; +-} + + use subs @EXPORT_OK; +
Re: NEW: sysutils/vifm
Landry Breuil said: > Doing a FLAVOR for this is just overkill, as 99% of the users wont know > which one to choose (shall we build both by default?), Idea is that people should install package with no FLAVOR. If they really, really want to have as little dependencies as possible, they install "no_x11" FLAVORed package. > and expect a non-no_x11 flavor to have some kind of GUI.. Let them. Really, X11 does not mean GUI. > Oh, and the code in src/int/file_magic.c even has a fallback to use file > %s -b --mime-type called via popen().. > > In terms of priority: > --- > if(get_gtk_mimetype(file, mimetype) == -1) > { > if(get_magic_mimetype(file, mimetype) == -1) > { > if(get_file_mimetype(file, mimetype, sizeof(mimetype)) == -1) > return NULL; > } > } > --- > > So by default the primary method is gtk, then magic, then file. Maybe file is not a bad option - in the end it is the most secure filetype detection tool we have in OpenBSD ATM. > And if i still look at the code... one of the uses of getting the > mimetype of a file seems to be.. to print the mimetype. Another (grep -r > get_handlers) seems to be to propose the various mimetype handlers found > in the desktop files to handle it. am i reading this right ? Well, I don't use file managers, but I suppose that printing mimetype and automagically open files in right application is why you may want a file managers. Otherwise cp, rm, ln and cd are your file manager. -- Dmitrij D. Czarkoff
Re: NEW: sysutils/vifm
On Tue, Feb 02, 2016 at 08:56:35PM +0100, Rafael Sadowski wrote: > On Tue Feb 02, 2016 at 05:09:34PM +0100, Tobias Ulmer wrote: > > What's the point when it requires half of GNOME? You should call the > > package gvifm... > > Is that my fault!? If you don't like, it don't use it. I'm NOT a vifm > developer. I only port for my friend Uwe. That's it! Take a chill pill, dude. I find it hilarious (and a little disgusting) a ncurses based file manager now depends on gtk. > > > > > CONFIGURE_ARGS += --without-gtk --without-libmagic --without-X11 > > --without-dyn-X11 > > That's not my line. Indeed, that's was my mild suggestion/attempt at decreasing the bloat. I've tried it like this on sparc64 and it worked fine. > > > > > > (libmagic is a security disaster waiting to happen in a file manager) > > I follow you but it's just a port and not base stuff. I see misc/screen > in the ports tree. In my opinion screen is creep but it's only my > personal opinion. > > Finale, Dmitrij D. Czarkoff starts a "no_x11" flavor. Thanks Dmitrij. > https://github.com/jasperla/openbsd-wip/commit/a755a173f7ff05c23ab6d999716a4fe4855a54bc Good idea, I like it. > > Best regards, > > Rafael
Re: NEW: sysutils/vifm
On Tue, Feb 02, 2016 at 10:41:12PM +0100, Rafael Sadowski wrote: > Yes, if we disable GTK+ and libmagic we fallback to file(1). Easy choice. Just use file(1) and disable the others. file(1) is satisfied by the base install (no extra deps) and is also the most secure option of the bunch.
Re: NEW: sysutils/vifm
On 2016/02/02 21:58, Landry Breuil wrote: > Oh, and the code in src/int/file_magic.c even has a fallback to use file > %s -b --mime-type called via popen().. It would be nice to kill the other options and use file(1) from base as the only detection method, it is *loads* safer.
Re: NEW: sysutils/vifm
On Tue, Feb 02, 2016 at 09:44:52PM +0100, Landry Breuil wrote: > On Tue, Feb 02, 2016 at 09:34:13PM +0100, Dmitrij D. Czarkoff wrote: > > Landry Breuil said: > > > Im not sure 'feature-set-wise' that it's worth adding the complexity of > > > a FLAVOR. > > > > Flavors were supposed to address the "half GNOME" issue. > > Sure, but in that particular case it turned into 'do you want your mime > detection to be done with gtk+ (bo gnome blooaaat) or with libmagic > (bo full of security issues)' :) > > Honestly, try both implementations, figure out which one 'performs' > better in termes of filetype detection, and choose the less worst :) or > just disable the feature if it not used much/broken. > > Doing a FLAVOR for this is just overkill, as 99% of the users wont know > which one to choose (shall we build both by default?), and expect a > non-no_x11 flavor to have some kind of GUI.. Oh, and the code in src/int/file_magic.c even has a fallback to use file %s -b --mime-type called via popen().. In terms of priority: --- if(get_gtk_mimetype(file, mimetype) == -1) { if(get_magic_mimetype(file, mimetype) == -1) { if(get_file_mimetype(file, mimetype, sizeof(mimetype)) == -1) return NULL; } } --- So by default the primary method is gtk, then magic, then file. And if i still look at the code... one of the uses of getting the mimetype of a file seems to be.. to print the mimetype. Another (grep -r get_handlers) seems to be to propose the various mimetype handlers found in the desktop files to handle it. am i reading this right ? Oh well. Landry
Security update: net/ntp 4.2.8p6
Security update for net/ntp to 4.2.8p6. This addresses numerous security issues. http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities As far as I can tell, the problem fixed by the ssl_init.c patch only concerns the regression test itself and doesn't appear in actual protocol code. The Makefile dependencies want to regenerate run-ssl_init.c with ruby(1), but since nothing would change in that file, we can short-ciruit this. OK? Index: Makefile === RCS file: /cvs/ports/net/ntp/Makefile,v retrieving revision 1.67 diff -u -p -r1.67 Makefile --- Makefile10 Nov 2015 18:33:02 - 1.67 +++ Makefile2 Feb 2016 20:54:34 - @@ -6,7 +6,7 @@ COMMENT=Network Time Protocol reference # to confuse with the ports system's 'pN' convention, so convert it to # 'pl' for local use. -VERSION= 4.2.8p4 +VERSION= 4.2.8p6 DISTNAME= ntp-${VERSION} PKGNAME= ntp-${VERSION:S/p/pl/} CATEGORIES=net @@ -39,6 +39,8 @@ LIB_DEPENDS= devel/libevent2 post-patch: cp ${WRKSRC}/sntp/loc/freebsd ${WRKSRC}/sntp/loc/openbsd +# short-circuit regeneration after patching ssl_init.c + touch ${WRKSRC}/tests/libntp/run-ssl_init.c post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ntp Index: distinfo === RCS file: /cvs/ports/net/ntp/distinfo,v retrieving revision 1.19 diff -u -p -r1.19 distinfo --- distinfo10 Nov 2015 18:33:02 - 1.19 +++ distinfo2 Feb 2016 20:54:34 - @@ -1,2 +1,2 @@ -SHA256 (ntp-4.2.8p4.tar.gz) = DWlhVyVI0sSvlvWPdj4irGIPWv73FzhN3DF6DjZc/bk= -SIZE (ntp-4.2.8p4.tar.gz) = 7104852 +SHA256 (ntp-4.2.8p6.tar.gz) = WD0OHFc6zjCpxq++oPxSyunIyRbbwVwCbkhaDdpLoEg= +SIZE (ntp-4.2.8p6.tar.gz) = 7152557 Index: patches/patch-tests_libntp_ssl_init_c === RCS file: patches/patch-tests_libntp_ssl_init_c diff -N patches/patch-tests_libntp_ssl_init_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-tests_libntp_ssl_init_c 2 Feb 2016 20:54:34 - @@ -0,0 +1,21 @@ +$OpenBSD$ +--- tests/libntp/ssl_init.c.orig Wed Jan 20 09:56:48 2016 tests/libntp/ssl_init.cTue Feb 2 21:38:07 2016 +@@ -43,7 +43,7 @@ test_SHA1KeyTypeWithDigestLength(void) { + size_t digestLength; + size_t expected = TEST_SHA1_DIGEST_LENGTH; + +- TEST_ASSERT_EQUAL(NID_sha, keytype_from_text("SHA", )); ++ TEST_ASSERT_EQUAL(NID_sha1, keytype_from_text("SHA1", )); + TEST_ASSERT_EQUAL(expected, digestLength); + /* OPENSSL */ + #else +@@ -62,7 +62,7 @@ test_MD5KeyName(void) { + void + test_SHA1KeyName(void) { + #ifdef OPENSSL +- TEST_ASSERT_EQUAL_STRING("SHA", keytype_name(NID_sha)); ++ TEST_ASSERT_EQUAL_STRING("SHA1", keytype_name(NID_sha1)); + #else + TEST_IGNORE_MESSAGE("Skipping because OPENSSL isn't defined"); + #endif/* OPENSSL */ -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: NEW: sysutils/vifm
On Tue Feb 02, 2016 at 10:16:47PM +0100, Dmitrij D. Czarkoff wrote: > Landry Breuil said: > > Doing a FLAVOR for this is just overkill, as 99% of the users wont know > > which one to choose (shall we build both by default?), > > Idea is that people should install package with no FLAVOR. If they > really, really want to have as little dependencies as possible, they > install "no_x11" FLAVORed package. > > > and expect a non-no_x11 flavor to have some kind of GUI.. > > Let them. Really, X11 does not mean GUI. I like the flavor idea from Dmitrij. It feels right. Tobias tried it on sparc64 (Not the flavor but some flags). So let's try with flavor. Dmitrij has begun so let's (maybe) improve and test at daily work. > > > Oh, and the code in src/int/file_magic.c even has a fallback to use file > > %s -b --mime-type called via popen().. > > > > In terms of priority: > > --- > > if(get_gtk_mimetype(file, mimetype) == -1) > > { > > if(get_magic_mimetype(file, mimetype) == -1) > > { > > if(get_file_mimetype(file, mimetype, sizeof(mimetype)) == -1) > > return NULL; > > } > > } > > --- > > > > So by default the primary method is gtk, then magic, then file. > > Maybe file is not a bad option - in the end it is the most secure > filetype detection tool we have in OpenBSD ATM. > > > And if i still look at the code... one of the uses of getting the > > mimetype of a file seems to be.. to print the mimetype. Another (grep -r > > get_handlers) seems to be to propose the various mimetype handlers found > > in the desktop files to handle it. am i reading this right ? > > Well, I don't use file managers, but I suppose that printing mimetype > and automagically open files in right application is why you may want a > file managers. Otherwise cp, rm, ln and cd are your file manager. > Yes, if we disable GTK+ and libmagic we fallback to file(1).
Re: NEW: sysutils/vifm
On Tue, Feb 02, 2016 at 10:52:45PM +0100, Stefan Sperling wrote: > On Tue, Feb 02, 2016 at 10:41:12PM +0100, Rafael Sadowski wrote: > > Yes, if we disable GTK+ and libmagic we fallback to file(1). > > Easy choice. Just use file(1) and disable the others. file(1) is satisfied > by the base install (no extra deps) and is also the most secure option of > the bunch. Tried with just the file backend enabled, it's "less" rich than the gtk/libmagic combination but works for pdf/jpg/txt/mp3. No match for tgz, proposes fuse-archivemount for .tar.gz, proposes text editor for gpx/gsb... for the latter, the correct mimetype was found and the best handler was proposed. I guess that's what you get for using file from base which is ... basic. (try :f on a file to see the available handlers for the detected mimetype) Landry
Re: windowmaker 0.95.7 anyone?
On 09:53, David Coppa wrote: If you send me what you have atm, I'll have a look... Sure, thanks. Juan Francisco Cantero Hurtado suggested to remove any pledge() patches for now so I did that. As I said: I have been using this for the last 3 months or so without any issues. Especially I did not see any of the bugs that the older wmaker related threads mentioned (windows spawning multiple times etc.). Regards, Michael windowmaker.tgz Description: application/tar-gz
Re: NEW: sysutils/vifm
Stuart Henderson said: > On 2016/02/02 21:58, Landry Breuil wrote: > > Oh, and the code in src/int/file_magic.c even has a fallback to use file > > %s -b --mime-type called via popen().. > > It would be nice to kill the other options and use file(1) from base > as the only detection method, it is *loads* safer. Well, the actual code is: | snprintf(command, sizeof(command), "file \"%s\" -b --mime-type", filename); Note double quotes. Of course no quoting is performed on filename. Thus: 1. If filename contains double quote, vifm sigfaults. 2. If filename is nasty, nasty things happen. Eg. I renamed a png image to "$(echo text)", and vifm opened it in vi. I guess filename "`doas rm -Rf $HOME/*`" will also pleasantly surprise user. -- Dmitrij D. Czarkoff
Re: NEW: sysutils/vifm
Stuart Henderson said: > On 2016/02/03 00:25, Dmitrij D. Czarkoff wrote: > > Stuart Henderson said: > > > On 2016/02/02 21:58, Landry Breuil wrote: > > > > Oh, and the code in src/int/file_magic.c even has a fallback to use file > > > > %s -b --mime-type called via popen().. > > > > > > It would be nice to kill the other options and use file(1) from base > > > as the only detection method, it is *loads* safer. > > > > Well, the actual code is: > > > > | snprintf(command, sizeof(command), "file \"%s\" -b --mime-type", > > filename); > > > > Note double quotes. Of course no quoting is performed on filename. > > Thus: > > > > 1. If filename contains double quote, vifm sigfaults. > > 2. If filename is nasty, nasty things happen. Eg. I renamed a png image > >to "$(echo text)", and vifm opened it in vi. I guess filename > >"`doas rm -Rf $HOME/*`" will also pleasantly surprise user. > > Ugh. I have seen CVEs assigned for smaller problems than that! I've added a naive patch to openbsd-wip version of this port. Vifm still opens renamed png in vi, but at least does not execute commands. -- Dmitrij D. Czarkoff
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/02/02 16:08:40 Modified files: graphics/py-Pillow: Makefile Added files: graphics/py-Pillow/patches: patch-libImaging_PcdDecode_c Log message: Add upstream patch to py-Pillow, fixing a buffer overflow in PcdDecode.c, where the decoder writes assuming 4 bytes per pixel into a 3 byte per pixel wide buffer, allowing writing 768 bytes off the end of the buffer. This overwrites objects in Python's stack, leading to a crash. https://github.com/python-pillow/Pillow/pull/1706 (There's also a newer upstream release but that will need additional checking before it can go in).
Re: NEW: sysutils/vifm
On 2016/02/03 00:25, Dmitrij D. Czarkoff wrote: > Stuart Henderson said: > > On 2016/02/02 21:58, Landry Breuil wrote: > > > Oh, and the code in src/int/file_magic.c even has a fallback to use file > > > %s -b --mime-type called via popen().. > > > > It would be nice to kill the other options and use file(1) from base > > as the only detection method, it is *loads* safer. > > Well, the actual code is: > > | snprintf(command, sizeof(command), "file \"%s\" -b --mime-type", filename); > > Note double quotes. Of course no quoting is performed on filename. > Thus: > > 1. If filename contains double quote, vifm sigfaults. > 2. If filename is nasty, nasty things happen. Eg. I renamed a png image >to "$(echo text)", and vifm opened it in vi. I guess filename >"`doas rm -Rf $HOME/*`" will also pleasantly surprise user. Ugh. I have seen CVEs assigned for smaller problems than that!
Re: windowmaker 0.95.7 anyone?
On 02/02/16 23:12, mi...@dataswamp.org wrote: On 09:53, David Coppa wrote: If you send me what you have atm, I'll have a look... Sure, thanks. Juan Francisco Cantero Hurtado suggested to remove any pledge() patches for now so I did that. As I said: I have been using this for the last 3 months or so without any issues. Especially I did not see any of the bugs that the older wmaker related threads mentioned (windows spawning multiple times etc.). Regards, Michael configure runs through, but then it fails on building that it cannot find aclocal-1.14 installing automake-1.14.1 let me build the package. Wondering why this aclocal run pops up in hte build stage, and not in some (pre) configure step. using it with GNUstep GWorkspace desktop, works fine so far. Instead of that tarball, a patch against current ports tree would be better. cheers, Sebastian
Re: NEW: sysutils/vifm
Landry Breuil said: > Tried with just the file backend enabled, it's "less" rich than the > gtk/libmagic combination but works for pdf/jpg/txt/mp3. No match for tgz, > proposes fuse-archivemount for .tar.gz, proposes text editor for > gpx/gsb... for the latter, the correct mimetype was found and the best > handler was proposed. I guess that's what you get for using file from > base which is ... basic. I somehow overlooked the fact that vifm only uses X11 to set window title. I bet people may live without this feature. (I thought it uses X11 for clipboard.) Provided that basic things work with file(1) backend, FLAVORs indeed don't seem a good idea. Attached tarball contains a non-FLAVORed port for vifm with all optional features disabled. Brief testing demonstrates that it is buggy (prints artifacts in file info dialog for some file names, provides different set of handlers for the files with same mime type, seldom picks different handlers for the same file). I believe that my patch makes file(1) usage in this port at least safer then it was. FLAVORed version is still available in openbsd-wip repo. I am not really interested in vifm, so I leave this port here as it is. -- Dmitrij D. Czarkoff vifm-0.8.1.tgz Description: application/tar-gz
Re: jabberd out of date
Stephen Graf wrote: > It would seem that the current version of the jabberd package is 2.0, > with a date of about May 2013. The latest release is 2.3.5. I > installed the jabberd package on openBSD 5.8 and was experiencing some > difficulties with the SSL certs. I would rather work with a more > recent version before digging into problems. > > Would it be possible to have port for a more recent release? It looks like jabberd doesn't have a maintainer. The most reliable solution is to try updating it yourself: http://www.openbsd.org/faq/ports/index.html It's easier than it sounds if you have some coding experience. Otherwise, you can wait and see if someone else updates it.
Re: NEW: sysutils/vifm
On Wed, Feb 03, 2016 at 12:42:34AM +0100, Dmitrij D. Czarkoff wrote: > Stuart Henderson said: > > On 2016/02/03 00:25, Dmitrij D. Czarkoff wrote: > > > Stuart Henderson said: > > > > On 2016/02/02 21:58, Landry Breuil wrote: > > > > > Oh, and the code in src/int/file_magic.c even has a fallback to use > > > > > file > > > > > %s -b --mime-type called via popen().. > > > > > > > > It would be nice to kill the other options and use file(1) from base > > > > as the only detection method, it is *loads* safer. > > > > > > Well, the actual code is: > > > > > > | snprintf(command, sizeof(command), "file \"%s\" -b --mime-type", > > > filename); > > > > > > Note double quotes. Of course no quoting is performed on filename. > > > Thus: > > > > > > 1. If filename contains double quote, vifm sigfaults. > > > 2. If filename is nasty, nasty things happen. Eg. I renamed a png image > > >to "$(echo text)", and vifm opened it in vi. I guess filename > > >"`doas rm -Rf $HOME/*`" will also pleasantly surprise user. > > > > Ugh. I have seen CVEs assigned for smaller problems than that! > > I've added a naive patch to openbsd-wip version of this port. Vifm > still opens renamed png in vi, but at least does not execute commands. better report it directly upstream then ? :) Landry
Re: [maintainer update] AlephOne + scenarios 1.2.1 20150620
On 2016 Jan 29 (Fri) at 06:13:56 -0700 (-0700), Anthony J. Bentley wrote: :Hi Peter, : :Peter Hessler writes: :> The Aleph One 1.2 release features online leaderboards and game :> statistics, a streamlined saved-game system, and full multiplayer :> support for the original Marathon game. This release also includes a :> number of other new features and bug fixes. :... :> All three scenarios Marathon 1, 2, Infinity were lightly tested on amd64 :> with intel ?haswell? graphics. Thinkpad x250. : :Here's a slightly updated diff: : :- Updates homepage for alephone, and links individual games to their own : homepages :- Adds boost and curl to LIB_DEPENDS, clean up output of : "make port-lib-depends-check" :- Brings back the files3.bungie.org mirror; the "evil" and "red" : scenarios are still fetched from there : :I've also tested on i386/intel, amd64/radeon. : :ok? (or you can commit with my ok) : Yes, thanks for doing that. OK from me. You did the last bit, you get to commit :) :Index: alephone/Makefile :=== :RCS file: /cvs/ports/games/alephone/alephone/Makefile,v :retrieving revision 1.19 :diff -u -p -r1.19 Makefile :--- alephone/Makefile 10 Aug 2014 21:35:32 - 1.19 :+++ alephone/Makefile 29 Jan 2016 12:51:40 - :@@ -3,31 +3,31 @@ : DIST_SUBDIR ?=alephone : COMMENT = open source game engine based on Marathon 2: Durandal : :-DISTNAME =AlephOne-20140104 :-PKGNAME = alephone-1.1 :-REVISION =0 :+DATE =20150620 :+DISTNAME =AlephOne-${DATE} :+PKGNAME = alephone-1.2.1 : : EXTRACT_SUFX =.tar.bz2 : CATEGORIES = games x11 : :-HOMEPAGE =http://source.bungie.org :+HOMEPAGE =https://alephone.lhowon.org/ : : MAINTAINER = Peter Hessler: : # GPLv2 or later : PERMIT_PACKAGE_CDROM =Yes : :-MASTER_SITES =${MASTER_SITE_SOURCEFORGE:=marathon/} :+MASTER_SITES = https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${DATE}/ : : WANTLIB +=GL GLU c m pthread stdc++ z : WANTLIB +=SDL SDL_net SDL_image SDL_ttf mad png sndfile : WANTLIB +=smpeg speex speexdsp vorbisfile zzip :-WANTLIB += avcodec avformat avutil swscale :+WANTLIB += avcodec avformat avutil swscale boost_filesystem boost_system curl : : BUILD_DEPENDS = devel/automake/${AUTOMAKE_VER} \ :- devel/autoconf/${AUTOCONF_VER} \ :- devel/boost :+ devel/autoconf/${AUTOCONF_VER} : LIB_DEPENDS = archivers/zziplib \ :+ devel/boost \ : devel/sdl-net \ : devel/sdl-image \ : devel/sdl-ttf \ :@@ -36,7 +36,8 @@ LIB_DEPENDS =archivers/zziplib \ : audio/libsndfile \ : audio/speex \ : audio/libvorbis \ :- graphics/ffmpeg :+ graphics/ffmpeg \ :+ net/curl : : USE_BZIP2 = Yes : USE_GMAKE = Yes :@@ -44,6 +45,7 @@ CONFIGURE_STYLE =gnu : AUTOCONF_VER =2.61 : AUTOMAKE_VER =1.9 : CONFIGURE_ENV = AUTOCONF_VERSION=${AUTOCONF_VER} \ :- AUTOMAKE_VERSION=${AUTOMAKE_VER} :+ AUTOMAKE_VERSION=${AUTOMAKE_VER} \ :+ CPPFLAGS=-I${LOCALBASE}/include : : .include :Index: alephone/distinfo :=== :RCS file: /cvs/ports/games/alephone/alephone/distinfo,v :retrieving revision 1.9 :diff -u -p -r1.9 distinfo :--- alephone/distinfo 17 Apr 2014 06:58:47 - 1.9 :+++ alephone/distinfo 29 Jan 2016 12:51:40 - :@@ -1,2 +1,2 @@ :-SHA256 (alephone/AlephOne-20140104.tar.bz2) = f301wdmc3dfNC0fT5LhDETc7BMYEAs6G6dhcNt+6q80= :-SIZE (alephone/AlephOne-20140104.tar.bz2) = 4919455 :+SHA256 (alephone/AlephOne-20150620.tar.bz2) = wPNg37dKYmT5XTdRA6dAAJMM8EOf+wRk+RX1N5RD4TM= :+SIZE (alephone/AlephOne-20150620.tar.bz2) = 5031898 :Index: alephone/patches/patch-Source_Files_FFmpeg_Movie_cpp :=== :RCS file: /cvs/ports/games/alephone/alephone/patches/patch-Source_Files_FFmpeg_Movie_cpp,v :retrieving revision 1.1 :diff -u -p -r1.1 patch-Source_Files_FFmpeg_Movie_cpp :--- alephone/patches/patch-Source_Files_FFmpeg_Movie_cpp 17 Apr 2014 06:58:47 - 1.1 :+++ alephone/patches/patch-Source_Files_FFmpeg_Movie_cpp 29 Jan 2016 12:51:40 - :@@ -1,15 +0,0 @@ :-$OpenBSD: patch-Source_Files_FFmpeg_Movie_cpp,v 1.1 2014/04/17 06:58:47 bentley Exp $ :-Remove use of deprecated quality setting. :- :-From upstream r5002. : Source_Files/FFmpeg/Movie.cpp.origThu Feb
Re: windowmaker 0.95.7 anyone?
On Sat, Jan 30, 2016 at 10:45 AM,wrote: > Hi there, > > Is there currently someone trying to update windowmaker to 0.95.7 ? There > were several threads regarding new windowmaker versions, the last one was: > https://marc.info/?t=14260999831=1=2 > I did not see any progress since. > I took the 0.95.5 port from openbsd-wip (which seemed broken btw.) and made > the necessary changes to build 0.95.7. It works for me on the latest amd64 > snapshot without any issues so far. There is still some work to do like > reading over the old patches, implementing pledge (I did this only very > rudimentary), reviewing all the snprintf warnings etc. I would love to do > all that, however if someone else is already on it, or noone wants to go > away from 0.92.0 there is probably no need for that. If you send me what you have atm, I'll have a look... Ciao! David
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2016/02/02 03:06:47 Modified files: devel/p5-File-Remove: Makefile distinfo Log message: Update to p5-File-Remove-1.55.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2016/02/02 03:17:44 Modified files: games/alephone/alephone: Makefile distinfo games/alephone/scenarios: Makefile.inc games/alephone/scenarios/marathon: Makefile distinfo games/alephone/scenarios/marathon/pkg: PLIST games/alephone/scenarios/marathon2: Makefile distinfo games/alephone/scenarios/marathon2/pkg: PLIST games/alephone/scenarios/marathoninfinity: Makefile distinfo games/alephone/scenarios/marathoninfinity/pkg: PLIST Removed files: games/alephone/alephone/patches: patch-Source_Files_FFmpeg_Movie_cpp patch-Source_Files_FFmpeg_SDL_ffmpeg_c Log message: Update to alephone-1.2.1. Release notes: https://github.com/Aleph-One-Marathon/alephone/releases/tag/release-20150620 ok phessler@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/02/02 03:41:06 Modified files: net/socat : Tag: OPENBSD_5_8 Makefile distinfo net/socat/patches: Tag: OPENBSD_5_8 patch-xio-openssl_c Log message: MFC security update to socat-1.7.3.1 - A stack overflow in vulnerability was found that can be triggered when command line arguments (complete address specifications, host names, file names) are longer than 512 bytes. - In the OpenSSL address implementation the hard coded 1024 bit DH p parameter was not prime. [..] Fix: generated a new 2048bit prime.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2016/02/02 03:11:46 Modified files: devel/p5-Glib2 : Makefile distinfo Log message: Update to p5-Glib2-1.321.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2016/02/02 03:13:04 Modified files: textproc/apertium-dicts/dan-nor: Makefile distinfo Log message: Update to apertium-dan-nor-1.2.2.
Re: pkg_add xombrero fails on GENERIC.MP #1867
On 2016/02/02 00:22, Andrew wrote: > FYI -- these are just the errors from my 2nd attempted install using > pkg_add xombrero. The 1st attempt installed quite a few packages but > did not finish to success. Thanks for everything. ftp5.usa (and some other mirrors) have not synced all of the packages in this directory. They should catch up later, or you can try a different mirror, these seem ok: mirror.esc7.net openbsd.cs.toronto.edu openbsd.mirror.frontiernet.net
Re: apache-httpd-openbsd: new DH params
On 2016/02/02 14:10, Darren Tucker wrote: > On Mon, Feb 01, 2016 at 12:56:43PM +, Stuart Henderson wrote: > > Based on my memory of dtucker's earlier diff which I OK'd and lost :-) > > Below is the patch for reference (after some more turd polishing on my > part). I also had second thoughts about generating it at build time for > reasons of slowness and fingerprinting potential and never got back to it. I have that one, but didn't forward that for those reasons (and I didn't want to dig into all the implications of changing sizes) it's the earlier one which updated the 512/1024 hardcoded values that I didn't keep a copy of and was recreating here. > > This updates the baked-in DH params of the apache 1.3 port for people > > who haven't been able to migrate to a supported http server yet. > > There's an explanation in the comment in the patch header. > [...] > > +The whole source file can be run as a perl script (note it uses > > +indent(1) and .indent.pro files in your $HOME affect formatting). > > My diff cd'ed to and setenv'ed HOME to the buld working dir to avoid > those dependencies (based on what the FreeBSD port did): > > (cd ${WRKSRC}/src/modules/ssl && ${SETENV} HOME=${WRKSRC} perl > ssl_engine_dh.c) Yes, that's definitely needed if it's generated during the build.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/02/02 02:25:53 Modified files: devel/ruby-rspec/specinfra: Makefile distinfo Log message: update to specinfra-2.50.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/02/02 02:24:46 Modified files: geo/geocode-glib: Makefile distinfo geo/geocode-glib/pkg: PLIST Log message: update to geocode-glib-3.18.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2016/02/02 02:31:47 Modified files: textproc/apertium-dicts/dan: Makefile distinfo textproc/apertium-dicts/dan-nor: Makefile distinfo textproc/apertium-dicts/dan-nor/pkg: PLIST textproc/apertium-dicts/nno: Makefile distinfo textproc/apertium-dicts/nno-nob: Makefile textproc/apertium-dicts/nob: Makefile distinfo Log message: Update to apertium-dan-nor-1.2.2. This brings in some dictionary updates: apertium-dan-0.3.0 apertium-nno-0.5.0 apertium-nob-0.5.1 Bump apertium-nno-nob, as it is also generated from these dictionaries.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2016/02/02 03:22:30 Modified files: devel/p5-Pango : Makefile distinfo Log message: Update to p5-Pango-1.227.
Re: NEW: sysutils/vifm
On Tue, Feb 02, 2016 at 05:18:13PM +0100, Dmitrij D. Czarkoff wrote: > Tobias Ulmer said: > > What's the point when it requires half of GNOME? You should call the > > package gvifm... > > GTK+ is not half of GNOME. Is this supposed to make me feel better? :p > > -- > Dmitrij D. Czarkoff >
Re: NEW: sysutils/vifm
Tobias Ulmer said: > What's the point when it requires half of GNOME? You should call the > package gvifm... GTK+ is not half of GNOME. -- Dmitrij D. Czarkoff
Re: 5.8 stable tag not so stable
On Tue, 2 Feb 2016 10:35:25 -0500, sven falempinwrote: > isc-dhcp (flavor server only) is not building. FWIW, I just run make package: ===> Building package for isc-dhcp-server-4.3.3.1 Create /usr/ports/packages/amd64/all/isc-dhcp-server-4.3.3.1.tgz Link to /usr/ports/packages/amd64/ftp/isc-dhcp-server-4.3.3.1.tgz Link to /usr/ports/packages/amd64/cdrom/isc-dhcp-server-4.3.3.1.tgz `/usr/ports/pobj/isc-dhcp-4.3.3.1/fake-amd64/.fake_done' is up to date. ===> Building package for isc-dhcp-omapi-4.3.3.1 Create /usr/ports/packages/amd64/all/isc-dhcp-omapi-4.3.3.1.tgz Link to /usr/ports/packages/amd64/ftp/isc-dhcp-omapi-4.3.3.1.tgz Link to /usr/ports/packages/amd64/cdrom/isc-dhcp-omapi-4.3.3.1.tgz `/usr/ports/pobj/isc-dhcp-4.3.3.1/fake-amd64/.fake_done' is up to date. ===> Building package for isc-dhcp-client-4.3.3.1 Create /usr/ports/packages/amd64/all/isc-dhcp-client-4.3.3.1.tgz Link to /usr/ports/packages/amd64/ftp/isc-dhcp-client-4.3.3.1.tgz Link to /usr/ports/packages/amd64/cdrom/isc-dhcp-client-4.3.3.1.tgz /usr/ports/net/isc-dhcp$ uname -a OpenBSD virtie.chown.me 5.8 GENERIC#0 amd64
Re: 5.8 stable tag not so stable
On Tue, Feb 2, 2016 at 10:53 AM, Stuart Hendersonwrote: > > Please show the lines above where it has the compiler command line. > will do sorry :( -- - () ascii ribbon campaign - against html e-mail /\
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2016/02/02 09:17:13 Modified files: net/p5-Net-PcapWriter: Makefile distinfo Log message: update p5-Net-PcapWriter to 0.724
Re: pkg_add xombrero fails on GENERIC.MP #1867
On 2/2/16, Stuart Hendersonwrote: > On 2016/02/02 00:22, Andrew wrote: >> FYI -- these are just the errors from my 2nd attempted install using >> pkg_add xombrero. The 1st attempt installed quite a few packages but >> did not finish to success. Thanks for everything. > > ftp5.usa (and some other mirrors) have not synced all of the > packages in this directory. They should catch up later, or you can > try a different mirror, these seem ok: > > mirror.esc7.net > openbsd.cs.toronto.edu > openbsd.mirror.frontiernet.net I switched /etc/pkg.conf to the toronto mirror for a seamless install. Thanks Stuart -- and all the devs behind xombrero and openbsd -- have a great week ahead !!
Re: NEW: sysutils/vifm
Tobias Ulmer said: > On Tue, Feb 02, 2016 at 05:18:13PM +0100, Dmitrij D. Czarkoff wrote: > > Tobias Ulmer said: > > > What's the point when it requires half of GNOME? You should call the > > > package gvifm... > > > > GTK+ is not half of GNOME. > > Is this supposed to make me feel better? :p It makes *me* feel better. I have all of the dependencies anyway, just because of browser. -- Dmitrij D. Czarkoff
Re: NEW: sysutils/vifm
What's the point when it requires half of GNOME? You should call the package gvifm... CONFIGURE_ARGS += --without-gtk --without-libmagic --without-X11 --without-dyn-X11 (libmagic is a security disaster waiting to happen in a file manager) On Thu, Jan 28, 2016 at 06:18:59PM +0100, Rafael Sadowski wrote: > hey @ports and vifm friends, > > here is an up-to-date vifm port. Tested on amd64 by me and positive test > feedback from Uwe Werler. Port request by Uwe. > > I found a thread on ports@: > https://marc.info/?l=openbsd-ports=144944041505080=2 > > I can not confirm runtime problems or memory usage oversize at buildtime. > > 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]. > > Best regards, > > Rafael
5.8 stable tag not so stable
isc-dhcp (flavor server only) is not building. PctestIpv6.h: In member function 'virtual char* PctestIpv6::GetAddressFamilyString()': PctestIpv6.h:85: warning: deprecated conversion from string constant to 'char*' main.o: In function `DoTrout(Pctest*)': main.cc:(.text+0x955): warning: warning: random() may return deterministic values, is that what you want? *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2689 '/usr/ports/pobj/isc-dhcp-4.3.3.1/.patch_done': @if cd /usr/ports/net/isc-dh...) -- - () ascii ribbon campaign - against html e-mail /\
Re: 5.8 stable tag not so stable
On 2016/02/02 10:35, sven falempin wrote: > isc-dhcp (flavor server only) is not building. > > PctestIpv6.h: In member function 'virtual char* > PctestIpv6::GetAddressFamilyString()': > PctestIpv6.h:85: warning: deprecated conversion from string constant to > 'char*' > main.o: In function `DoTrout(Pctest*)': > main.cc:(.text+0x955): warning: warning: random() may return deterministic > values, is that what you want? > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2689 > '/usr/ports/pobj/isc-dhcp-4.3.3.1/.patch_done': @if cd > /usr/ports/net/isc-dh...) > > > -- > - > () ascii ribbon campaign - against html e-mail > /\ Please show the lines above where it has the compiler command line.
Re: [UPDATE] archivers/p7zip
p7zip-15.09p3 Core dumped when used "l" command to list contents of password protected archive. Core dumped when used "t" command to test integrity of password protected archive. $ 7z a -p test.7z test.txt Success. $ 7z l test.7z Enter password (will not be echoed):Abort trap (core dumped) $ 7z t test.7z Enter password (will not be echoed):Abort trap (core dumped) Index: Makefile === RCS file: /cvs/ports/archivers/p7zip/Makefile,v retrieving revision 1.30 diff -u -p -r1.30 Makefile --- Makefile31 Jan 2016 22:29:37 - 1.30 +++ Makefile3 Feb 2016 06:39:00 - @@ -6,7 +6,7 @@ COMMENT-main= file archiver with high co COMMENT-rar= rar modules for p7zip V= 15.09 -REVISION= 3 +REVISION= 4 DISTNAME= p7zip_${V}_src_all PKGNAME= p7zip-${V} PKGNAME-main= p7zip-${V} Index: patches/patch-CPP_7zip_UI_Console_Main_cpp === RCS file: /cvs/ports/archivers/p7zip/patches/patch-CPP_7zip_UI_Console_Main_cpp,v retrieving revision 1.3 diff -u -p -r1.3 patch-CPP_7zip_UI_Console_Main_cpp --- patches/patch-CPP_7zip_UI_Console_Main_cpp 31 Jan 2016 22:29:37 - 1.3 +++ patches/patch-CPP_7zip_UI_Console_Main_cpp 3 Feb 2016 06:39:00 - @@ -88,7 +88,7 @@ Pledge archivers/p7zip main executables +#ifdef PLEDGE_DEBUG + printf("reduced pledge: test stdout\n"); +#endif -+ if (pledge("stdio rpath", NULL) == -1) { ++ if (pledge("stdio rpath tty", NULL) == -1) { + perror("pledge"); + exit(2); +} @@ -106,7 +106,7 @@ Pledge archivers/p7zip main executables + printf("reduced pledge: list\n"); +#endif + -+ if (pledge("stdio rpath", NULL) == -1) { ++ if (pledge("stdio rpath tty", NULL) == -1) { +perror("pledge"); +exit(2); + }
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/02/03 00:24:15 Modified files: sysutils/salt : Makefile distinfo Log message: Update to salt-2015.8.5.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/02/02 16:58:38 Log message: Import vmdktool-1.4. The vmdktool utility converts raw filesystems to the VMDK format and vice versa. It can also produce information for a given VMDK file. req., tested by and OK reyk@ Status: Vendor Tag: ajacoutot Release Tags: ajacoutot_20160203 N ports/sysutils/vmdktool/distinfo N ports/sysutils/vmdktool/Makefile N ports/sysutils/vmdktool/pkg/PLIST N ports/sysutils/vmdktool/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/02/02 16:59:16 Modified files: sysutils : Makefile Log message: +vmdktool
graphics/djvulibre: fix a bug in documents with duplicate page titles
The patch adds support for documents with duplicate page titles. I need this change to update pdf2djvu to the latest version. I've not tested any djvu viewer, just the conversion. So any test is welcome. OK? Index: Makefile === RCS file: /cvs/ports/graphics/djvulibre/Makefile,v retrieving revision 1.34 diff -u -p -r1.34 Makefile --- Makefile12 May 2015 16:10:27 - 1.34 +++ Makefile3 Feb 2016 01:53:18 - @@ -3,6 +3,7 @@ COMMENT= view, decode and encode DjVu files DISTNAME= djvulibre-3.5.27 +REVISION= 0 SHARED_LIBS= djvulibre 26.0# 27.0 CATEGORIES=graphics print Index: patches/patch-libdjvu_DjVmDir_cpp === RCS file: patches/patch-libdjvu_DjVmDir_cpp diff -N patches/patch-libdjvu_DjVmDir_cpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-libdjvu_DjVmDir_cpp 3 Feb 2016 01:53:18 - @@ -0,0 +1,94 @@ +$OpenBSD$ + +"accept documents with duplicate page titles" + +http://sourceforge.net/p/djvu/djvulibre-git/ci/77a4dca8dd3acd0acc1680fa14a352c11084e25d/ +https://bitbucket.org/jwilk/pdf2djvu/issues/113/duplicate-page-title-1 + +--- libdjvu/DjVmDir.cpp.orig Tue Jul 8 23:15:07 2014 libdjvu/DjVmDir.cppWed Feb 3 01:51:28 2016 +@@ -223,7 +223,6 @@ DjVmDir::decode(const GP ) +page2file.resize(-1); +name2file.empty(); +id2file.empty(); +- title2file.empty(); + +int ver=str.read8(); +bool bundled=(ver & 0x80)!=0; +@@ -375,18 +374,6 @@ DjVmDir::decode(const GP ) + G_THROW( ERR_MSG("DjVmDir.dupl_id") "\t" + file->id); + id2file[file->id]=file; + } +- +- // Generate title2file map +- for(pos=files_list;pos;++pos) +- { +- GP file=files_list[pos]; +- if (file->title.length()) +- { +-if (title2file.contains(file->title)) +- G_THROW( ERR_MSG("DjVmDir.dupl_title") "\t" + file->title); +-title2file[file->title]=file; +- } +- } +} + } + +@@ -556,11 +543,19 @@ DjVmDir::id_to_file(const GUTF8String ) const + } + + GP +-DjVmDir::title_to_file(const GUTF8String ) const ++DjVmDir::title_to_file(const GUTF8String , GPosition spos) const + { +- GCriticalSectionLock lock((GCriticalSection *) _lock); +- GPosition pos; +- return (title2file.contains(title, pos))?title2file[pos]:(GP(0)); ++ if (! title) ++return 0; ++ GCriticalSectionLock lock((GCriticalSection *) _lock); ++ if (! spos) ++for (GPosition pos = spos; pos; ++pos) ++ if (files_list[pos]->is_page() && files_list[pos]->title == title) ++return files_list[pos]; ++ for (GPosition pos = files_list; pos; ++pos) ++if (files_list[pos]->is_page() && files_list[pos]->title == title) ++ return files_list[pos]; ++ return 0; + } + + GP +@@ -661,14 +656,7 @@ DjVmDir::insert_file(const GP & file, int pos_nu + G_THROW( ERR_MSG("DjVmDir.dupl_name2") "\t" + file->name); +name2file[file->name]=file; +id2file[file->id]=file; +- if (file->title.length()) +- { +- if (title2file.contains(file->title)) +- // duplicate titles may become ok some day +- G_THROW( ERR_MSG("DjVmDir.dupl_title2") "\t" + file->title); +- title2file[file->title]=file; +- } +- ++ + // Make sure that there is no more than one file with shared annotations +if (file->is_shared_anno()) +{ +@@ -727,7 +715,6 @@ DjVmDir::delete_file(const GUTF8String ) + { + name2file.del(f->name); + id2file.del(f->id); +- title2file.del(f->title); + if (f->is_page()) + { + for(int page=0;pagetitle); +file->title=title; +- title2file[title]=file; + } + + GPList Index: patches/patch-libdjvu_DjVmDir_h === RCS file: patches/patch-libdjvu_DjVmDir_h diff -N patches/patch-libdjvu_DjVmDir_h --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-libdjvu_DjVmDir_h 3 Feb 2016 01:53:18 - @@ -0,0 +1,41 @@ +$OpenBSD$ + +"accept documents with duplicate page titles" + +http://sourceforge.net/p/djvu/djvulibre-git/ci/77a4dca8dd3acd0acc1680fa14a352c11084e25d/ +https://bitbucket.org/jwilk/pdf2djvu/issues/113/duplicate-page-title-1 + +--- libdjvu/DjVmDir.h.orig Tue Jul 8 23:15:07 2014 libdjvu/DjVmDir.h Wed Feb 3 01:51:28 2016 +@@ -181,7 +181,8 @@ class DJVUAPI DjVmDir : public GPEnabled (public) + /** Translates file IDs to file records. */ +GP id_to_file(const GUTF8String ) const; + /** Translates file shortcuts to file records. */ +-