Created attachment 170906 [details] port_diff Summary of 4.8 update There are changes to the internals of the jail(8) command and changes to parameter names in the periodic files that have occurred in FreeBSD Release 10.2 that effects jail behavior in a very minor way. This version of qjail has an built in auto convert function that fixes those minor behavior problems with existing jails. This auto convert function is not documented in the qjail manual. Its only shown in the port install output. Issue [ qjail update -u ] from the host console. This will cause the existing "flavors" default & ssh-default directories to be renamed and new ones populated. Then in each existing jail the periodic.conf and newsyslog.conf files will be renamed with .saved suffix and new ones added. The rc.conf file will be updated in place changing the syslogd_enable= parameter value from "NO" to "YES". The new periodic.conf file has many sendmail reporting options disabled because sendmail is disabled in the jails rc.conf file by default. This drastically reduces the daily. weekly, monthly system and security status reports elapse run times. This has a major effect on operating system performance where there are a large number of jails.
This patch fails to apply cleanly against pkg-descr file.
There is no mandatory size limit on pkg-descr. This port does install clean. The pkg-descr has been this size since the beginning. Just look at previous versions of this port. Your comment is without details. You really have to give better feed back comments.
Joe, the patch cannot be applied against pkg-descr because it fails. The patch command can't apply it: Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN qjail-4.7/pkg-descr qjail/pkg-descr |--- qjail-4.7/pkg-descr 2016-04-16 18:29:58.000000000 -0400 |+++ qjail/pkg-descr 2016-05-29 09:30:59.454189000 -0400 -------------------------- Patching file pkg-descr using Plan A... Hunk #1 failed at 1. 1 out of 1 hunks failed while patching pkg-descr It looks to me the first paragraph you're removing, the "This version of qjail..." carries an extra space at the end of the line, before newline in the patch, but there's no such space in pkg-descr in the head. It would be best if you could run 'svn diff sysutils/qjail' in the root of your svn tree, that way svn can make a diff against unmodified orig.
Created attachment 171057 [details] port_diff re-send
I just did svn checkout of qjail and patched it with port_diff I submitted with this original pr. The one you said will not clean patch the pkg-descr file. I don't get any errors when patched here. Only thing I can think of is maybe port_diff file lost data during up loading to your system. I will re-send it again. You can run checksum on both files to see if they differ.
Created attachment 171077 [details] Svn diff after original patch (#171057) is applied w/ pkg-descr hunks manually Joe, nope, still fails. Nut, your new and old patches are identical. I've applied your patch, and applied the failing pkg-descr hunks manually (copy&paste in vim, clean up +-) against freshly updated svn tree. I've attached the patch I get with svn diff in the ports root dir, please check it out. I bet the pkg-descr hunk will fail in your case now. Committers if you use the patch I attached, please credit Joe, it's all his work, I merely helped with a hunk in pkg-descr. ;)
Apologies for the "nut" typo above, it was meant to say BUT. :)
To: Vladimir Krstulja You were correct the one you created did fail on the pkg-descr hunk when I patched the source I have here. I am willing to accept your version of the port_diff file. I don't understand why a svn checkout contains different content then the official svn source tree? The main important thing is there is now a port_diff file that works so the port update can be committed.
There is space at the end of two lines in the paragraph you're removing ("This version of qjail uses...", in your patch. You can see it if you vimdiff my patch and your patch, vimdiff colorizes it nicely, otherwise it's invisible in a plain diff. I guess you accidentally changed the orig pkg-descr since previous commit, or there's whitespace cleanup going on somwhere and you just patched against your local, previous source instead of latest, cleaned svn. Just speculating. Also, I forgot to request your approval flag, please flag the patch as maintainer-approval+. Yes, I can do it for you, but then my name would be written and I've noticed such commits crediting me then, so I stopped doing that. :)
Created attachment 171091 [details] port_diff.Vladimir bugzilla will not allow me to set the flag on your port_diff file. I go through the motions but the file flag doesn't get set. I think attachment has to be sent by me. I did svn checkout for qjail again to get a fresh copy of the port make files. I ran your port_diff and a newly created port_diff and they both worked. The only difference is your port_file has a single hunk for pkg-descr and the newly created port_diff does the same thing using 2 hunks. I am going to send both files so you can try both if needed. By the way I don't have a program called vimdiff on my system. Thanks for your help.
Created attachment 171092 [details] port_diff.new
Both new patches passed. I'll leave your last one and obsolete others now. Yeah the permission system, I was supposed to set the request first. My bad.
testbuilds are fine, committed, thanks.
A commit references this bug: Author: pi Date: Sun Jun 12 13:13:32 UTC 2016 New revision: 416800 URL: https://svnweb.freebsd.org/changeset/ports/416800 Log: sysutils/qjail: 4.7 -> 4.8 There are changes to the internals of the jail(8) command and changes to parameter names in the periodic files that have occurred in FreeBSD Release 10.2 that effects jail behavior in a very minor way. This version of qjail has an built in auto convert function that fixes those minor behavior problems with existing jails. This auto convert function is not documented in the qjail manual. Its only shown in the port install output. Issue [ qjail update -u ] from the host console. This will cause the existing "flavors" default & ssh-default directories to be renamed and new ones populated. Then in each existing jail the periodic.conf and newsyslog.conf files will be renamed with .saved suffix and new ones added. The rc.conf file will be updated in place changing the syslogd_enable= parameter value from "NO" to "YES". The new periodic.conf file has many sendmail reporting options disabled because sendmail is disabled in the jails rc.conf file by default. This drastically reduces the daily. weekly, monthly system and security status reports elapse run times. This has a major effect on operating system performance where there are a large number of jails. PR: 209929 Submitted by: Joe Barbish <qjail1@a1poweruser.com> (maintainer) Reviewed by: Vladimir Krstulja <vlad-fbsd@acheronmedia.com>, robak Changes: head/sysutils/qjail/Makefile head/sysutils/qjail/distinfo head/sysutils/qjail/pkg-descr head/sysutils/qjail/pkg-message head/sysutils/qjail/pkg-plist