Created attachment 375468 [details, diff] shorewall-4.5.21.9 EBuilds as patch Hi, I prepared a new patch set for the shorewall family. The set will add shorewall*-4.5.21.9 and remove shorewall*-4.5.{18,19,21.2,21.4}. So after you applied the patch, the only available shorewall versions will be - shorewall*-4.5.18-r1 (current stable) - shorewall*-4.5.21.7 - shorewall*-4.5.21.9 The patch should be applied against the portage tree, e.g. "/usr/portage", with "patch -p1 < shorewall-4.5.21.9.patch". Please remember to update all the Manifest files for - net-firewall/shorewall-core - net-firewall/shorewall - net-firewall/shorewall6 - net-firewall/shorewall-lite - net-firewall/shorewall6-lite - net-firewall/shorewall-init If you have any questions please don't hesitate to contact me. I am also available on FreeNode as "Whissi". Thanks. PS: The details from the previous bump can be found in bug 499174.
Hi, Thanks for the patch. However, in cvs, removed files need to explicitly removed using 'cvs remove $file' and new files and directories need to be explicitly added using 'cvs add $file or $directory'. Removed directories do not need to be removed with 'cvs remove'. Only the contents need removal. My point is that along with this patch, we need a little bit of scripting to issue the cvs commands which is a long process given the amount of changes. If you can get me a list with all the new files and directories and all the removed files, then I can probably put something together quickly. We can probably save that script for future additions and removals. What do you think?
(In reply to Markos Chandras from comment #1) > Hi, > > Thanks for the patch. However, in cvs, removed files need to explicitly I've complained about that patch format before, and here, again, it's proven why it doesn't work. Why not compile a list of the precise changes that a human can properly review? So for some cat/pkg, you make a unified diff from the latest current ebuild in the tree to the ebuild you want to have next. No changes, then no diff. Also, it's good to see the proposed changes, but obsolescence shouldn't be managed that way - that's best left to people with actual access to the tree (and a good idea what maintenance and stabilisation mean).
Also, when changes affect conf.d/init.d files, then they should probably get a revision suffixed.
(In reply to Jeroen Roovers from comment #2) > I've complained about that patch format before, and here, again, it's proven > why it doesn't work. I thought that the patch format I am now using is what you suggested. Please tell me what I should change. > Also, when changes affect conf.d/init.d files, then they should probably > get a revision suffixed. It is really hard to keep track of all the changes, why they were added, when they can be removed... keeping everything in in "${FILESDIR}/${PVR}" makes it easier for me. @ Markos: We are using "${FILESDIR}/${PVR}. You cannot use wildcards, can you? I.e. something like cvs add ... net-firewall/shorewall/files/4.5.21.9/* net-firewall/shorewall6/files/4.5.21.9/* net-firewall/shorewall-lite/files/4.5.21.9/* net-firewall/shorewall6-lite/files/4.5.21.9/* net-firewall/shorewall-init/files/4.5.21.9/* net-firewall/shorewall-core/files/4.5.21.9/* Can you work with the following list? # lsdiff -s shorewall.patch - net-firewall/shorewall/files/4.5.19/shorewall.confd - net-firewall/shorewall/files/4.5.19/shorewall.conf-SUBSYSLOCK.patch - net-firewall/shorewall/files/4.5.19/shorewall.initd - net-firewall/shorewall/files/4.5.19/shorewallrc - net-firewall/shorewall/files/4.5.19/shorewall.systemd - net-firewall/shorewall/files/4.5.21.2/shorewall.confd - net-firewall/shorewall/files/4.5.21.2/shorewall.initd - net-firewall/shorewall/files/4.5.21.2/shorewallrc - net-firewall/shorewall/files/4.5.21.2/shorewall.systemd - net-firewall/shorewall/files/4.5.21.4/shorewall.confd - net-firewall/shorewall/files/4.5.21.4/shorewall.initd - net-firewall/shorewall/files/4.5.21.4/shorewallrc - net-firewall/shorewall/files/4.5.21.4/shorewall.systemd + net-firewall/shorewall/files/4.5.21.9/shorewall.confd + net-firewall/shorewall/files/4.5.21.9/shorewall.initd + net-firewall/shorewall/files/4.5.21.9/shorewallrc + net-firewall/shorewall/files/4.5.21.9/shorewall.systemd - net-firewall/shorewall/files/shorewall.initd - net-firewall/shorewall/files/shorewallrc_new - net-firewall/shorewall/files/shorewall.systemd - net-firewall/shorewall/shorewall-4.5.18.ebuild - net-firewall/shorewall/shorewall-4.5.19.ebuild - net-firewall/shorewall/shorewall-4.5.21.2.ebuild - net-firewall/shorewall/shorewall-4.5.21.4.ebuild + net-firewall/shorewall/shorewall-4.5.21.9.ebuild - net-firewall/shorewall6/files/4.5.19/shorewall6.confd - net-firewall/shorewall6/files/4.5.19/shorewall6.conf-SUBSYSLOCK.patch - net-firewall/shorewall6/files/4.5.19/shorewall6.initd - net-firewall/shorewall6/files/4.5.19/shorewall6.systemd - net-firewall/shorewall6/files/4.5.19/shorewallrc - net-firewall/shorewall6/files/4.5.21.2/shorewall6.confd - net-firewall/shorewall6/files/4.5.21.2/shorewall6.initd - net-firewall/shorewall6/files/4.5.21.2/shorewall6.systemd - net-firewall/shorewall6/files/4.5.21.2/shorewallrc - net-firewall/shorewall6/files/4.5.21.4/shorewall6.confd - net-firewall/shorewall6/files/4.5.21.4/shorewall6.initd - net-firewall/shorewall6/files/4.5.21.4/shorewall6.systemd - net-firewall/shorewall6/files/4.5.21.4/shorewallrc + net-firewall/shorewall6/files/4.5.21.9/shorewall6.confd + net-firewall/shorewall6/files/4.5.21.9/shorewall6.initd + net-firewall/shorewall6/files/4.5.21.9/shorewall6.systemd + net-firewall/shorewall6/files/4.5.21.9/shorewallrc - net-firewall/shorewall6/files/shorewall6.initd - net-firewall/shorewall6/files/shorewall6.systemd - net-firewall/shorewall6/files/shorewallrc_new - net-firewall/shorewall6/shorewall6-4.5.18.ebuild - net-firewall/shorewall6/shorewall6-4.5.19.ebuild - net-firewall/shorewall6/shorewall6-4.5.21.2.ebuild - net-firewall/shorewall6/shorewall6-4.5.21.4.ebuild + net-firewall/shorewall6/shorewall6-4.5.21.9.ebuild - net-firewall/shorewall6-lite/files/4.5.19/shorewall6-lite.confd - net-firewall/shorewall6-lite/files/4.5.19/shorewall6-lite.initd - net-firewall/shorewall6-lite/files/4.5.19/shorewall6-lite.systemd - net-firewall/shorewall6-lite/files/4.5.19/shorewallrc - net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.confd - net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.initd - net-firewall/shorewall6-lite/files/4.5.21.2/shorewall6-lite.systemd - net-firewall/shorewall6-lite/files/4.5.21.2/shorewallrc - net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.confd - net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.initd - net-firewall/shorewall6-lite/files/4.5.21.4/shorewall6-lite.systemd - net-firewall/shorewall6-lite/files/4.5.21.4/shorewallrc + net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.confd + net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.initd + net-firewall/shorewall6-lite/files/4.5.21.9/shorewall6-lite.systemd + net-firewall/shorewall6-lite/files/4.5.21.9/shorewallrc - net-firewall/shorewall6-lite/files/shorewall6-lite.initd - net-firewall/shorewall6-lite/files/shorewall6-lite.systemd - net-firewall/shorewall6-lite/files/shorewallrc_new - net-firewall/shorewall6-lite/shorewall6-lite-4.5.18.ebuild - net-firewall/shorewall6-lite/shorewall6-lite-4.5.19.ebuild - net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.2.ebuild - net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.4.ebuild + net-firewall/shorewall6-lite/shorewall6-lite-4.5.21.9.ebuild - net-firewall/shorewall-core/files/4.5.19/shorewallrc - net-firewall/shorewall-core/files/4.5.21.2/shorewallrc - net-firewall/shorewall-core/files/4.5.21.4/shorewallrc + net-firewall/shorewall-core/files/4.5.21.9/shorewallrc - net-firewall/shorewall-core/files/shorewallrc_new - net-firewall/shorewall-core/shorewall-core-4.5.18.ebuild - net-firewall/shorewall-core/shorewall-core-4.5.19.ebuild - net-firewall/shorewall-core/shorewall-core-4.5.21.2.ebuild - net-firewall/shorewall-core/shorewall-core-4.5.21.4.ebuild + net-firewall/shorewall-core/shorewall-core-4.5.21.9.ebuild - net-firewall/shorewall-init/files/4.5.21.2/01_Remove-ipset-functionality.patch - net-firewall/shorewall-init/files/4.5.21.2/README.Gentoo.txt - net-firewall/shorewall-init/files/4.5.21.2/shorewall-init.confd - net-firewall/shorewall-init/files/4.5.21.2/shorewall-init.initd - net-firewall/shorewall-init/files/4.5.21.2/shorewall-init.systemd - net-firewall/shorewall-init/files/4.5.21.2/shorewallrc - net-firewall/shorewall-init/files/4.5.21.4/01_Remove-ipset-functionality.patch - net-firewall/shorewall-init/files/4.5.21.4/README.Gentoo.txt - net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.confd - net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.initd - net-firewall/shorewall-init/files/4.5.21.4/shorewall-init.systemd - net-firewall/shorewall-init/files/4.5.21.4/shorewallrc + net-firewall/shorewall-init/files/4.5.21.9/01_Remove-ipset-functionality.patch + net-firewall/shorewall-init/files/4.5.21.9/README.Gentoo.txt + net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.confd + net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.initd + net-firewall/shorewall-init/files/4.5.21.9/shorewall-init.systemd + net-firewall/shorewall-init/files/4.5.21.9/shorewallrc - net-firewall/shorewall-init/shorewall-init-4.5.21.2.ebuild - net-firewall/shorewall-init/shorewall-init-4.5.21.4.ebuild + net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild - net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.confd - net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.initd - net-firewall/shorewall-lite/files/4.5.19/shorewall-lite.systemd - net-firewall/shorewall-lite/files/4.5.19/shorewallrc - net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.confd - net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.initd - net-firewall/shorewall-lite/files/4.5.21.2/shorewall-lite.systemd - net-firewall/shorewall-lite/files/4.5.21.2/shorewallrc - net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.confd - net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.initd - net-firewall/shorewall-lite/files/4.5.21.4/shorewall-lite.systemd - net-firewall/shorewall-lite/files/4.5.21.4/shorewallrc + net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.confd + net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.initd + net-firewall/shorewall-lite/files/4.5.21.9/shorewall-lite.systemd + net-firewall/shorewall-lite/files/4.5.21.9/shorewallrc - net-firewall/shorewall-lite/files/shorewall-lite - net-firewall/shorewall-lite/files/shorewall-lite.systemd - net-firewall/shorewall-lite/files/shorewallrc_new - net-firewall/shorewall-lite/shorewall-lite-4.5.18.ebuild - net-firewall/shorewall-lite/shorewall-lite-4.5.19.ebuild - net-firewall/shorewall-lite/shorewall-lite-4.5.21.2.ebuild - net-firewall/shorewall-lite/shorewall-lite-4.5.21.4.ebuild + net-firewall/shorewall-lite/shorewall-lite-4.5.21.9.ebuild
BTW: I am currently not expecting another 4.5.x release - v4.6 will be released next month. We can discuss changes for the v4.6 package by mail. I am thinking about *one* shorewall package and to replace the other shorewall-* packages with USE flags. All the files I currently add to the FILESDIR could be in one single archive per release... this should help to reduce the effort currently needed to proxy-maintain shorewall in Gentoo. But as said, this should be discussed by mail (I am currently planing to get a new package ready in May, show it to proxy-maint/gentoo-dev to get feedback).
(In reply to Jeroen Roovers from comment #3) > Also, when changes affect conf.d/init.d files, then they should probably get > a revision suffixed. I don't understand the comment in this particular case. As far as I can see, the confd/initd files are removed completely.
Everything should be in place. Let me know if something is broken +*shorewall-4.5.21.9 (26 Apr 2014) + + 26 Apr 2014; Markos Chandras <hwoarang@gentoo.org> + +files/4.5.21.9/shorewall.confd, +files/4.5.21.9/shorewall.initd, + +files/4.5.21.9/shorewall.systemd, +files/4.5.21.9/shorewallrc, + +shorewall-4.5.21.9.ebuild, -files/4.5.19/shorewall.conf-SUBSYSLOCK.patch, + -files/4.5.19/shorewall.confd, -files/4.5.19/shorewall.initd, + -files/4.5.19/shorewall.systemd, -files/4.5.19/shorewallrc, + -files/4.5.21.2/shorewall.confd, -files/4.5.21.2/shorewall.initd, + -files/4.5.21.2/shorewall.systemd, -files/4.5.21.2/shorewallrc, + -files/4.5.21.4/shorewall.confd, -files/4.5.21.4/shorewall.initd, + -files/4.5.21.4/shorewall.systemd, -files/4.5.21.4/shorewallrc, + -files/shorewall.initd, -files/shorewall.systemd, -files/shorewallrc_new, + -shorewall-4.5.18.ebuild, -shorewall-4.5.19.ebuild, + -shorewall-4.5.21.2.ebuild, -shorewall-4.5.21.4.ebuild: + Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de> + +*shorewall-init-4.5.21.9 (26 Apr 2014) + + 26 Apr 2014; Markos Chandras <hwoarang@gentoo.org> + +files/4.5.21.9/01_Remove-ipset-functionality.patch, + +files/4.5.21.9/README.Gentoo.txt, +files/4.5.21.9/shorewall-init.confd, + +files/4.5.21.9/shorewall-init.initd, +files/4.5.21.9/shorewall-init.systemd, + +files/4.5.21.9/shorewallrc, +shorewall-init-4.5.21.9.ebuild, + -files/4.5.21.2/01_Remove-ipset-functionality.patch, + -files/4.5.21.2/README.Gentoo.txt, -files/4.5.21.2/shorewall-init.confd, + -files/4.5.21.2/shorewall-init.initd, -files/4.5.21.2/shorewall-init.systemd, + -files/4.5.21.2/shorewallrc, + -files/4.5.21.4/01_Remove-ipset-functionality.patch, + -files/4.5.21.4/README.Gentoo.txt, -files/4.5.21.4/shorewall-init.confd, + -files/4.5.21.4/shorewall-init.initd, -files/4.5.21.4/shorewall-init.systemd, + -files/4.5.21.4/shorewallrc, -shorewall-init-4.5.21.2.ebuild, + -shorewall-init-4.5.21.4.ebuild: + Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de> + +*shorewall6-lite-4.5.21.9 (26 Apr 2014) + + 26 Apr 2014; Markos Chandras <hwoarang@gentoo.org> + +files/4.5.21.9/shorewall6-lite.confd, +files/4.5.21.9/shorewall6-lite.initd, + +files/4.5.21.9/shorewall6-lite.systemd, +files/4.5.21.9/shorewallrc, + +shorewall6-lite-4.5.21.9.ebuild, -files/4.5.19/shorewall6-lite.confd, + -files/4.5.19/shorewall6-lite.initd, -files/4.5.19/shorewall6-lite.systemd, + -files/4.5.19/shorewallrc, -files/4.5.21.2/shorewall6-lite.confd, + -files/4.5.21.2/shorewall6-lite.initd, + -files/4.5.21.2/shorewall6-lite.systemd, -files/4.5.21.2/shorewallrc, + -files/4.5.21.4/shorewall6-lite.confd, -files/4.5.21.4/shorewall6-lite.initd, + -files/4.5.21.4/shorewall6-lite.systemd, -files/4.5.21.4/shorewallrc, + -files/shorewall6-lite.initd, -files/shorewall6-lite.systemd, + -files/shorewallrc_new, -shorewall6-lite-4.5.18.ebuild, + -shorewall6-lite-4.5.19.ebuild, -shorewall6-lite-4.5.21.2.ebuild, + -shorewall6-lite-4.5.21.4.ebuild: + Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de> + +*shorewall-lite-4.5.21.9 (26 Apr 2014) + + 26 Apr 2014; Markos Chandras <hwoarang@gentoo.org> + +files/4.5.21.9/shorewall-lite.confd, +files/4.5.21.9/shorewall-lite.initd, + +files/4.5.21.9/shorewall-lite.systemd, +files/4.5.21.9/shorewallrc, + +shorewall-lite-4.5.21.9.ebuild, -files/4.5.19/shorewall-lite.confd, + -files/4.5.19/shorewall-lite.initd, -files/4.5.19/shorewall-lite.systemd, + -files/4.5.19/shorewallrc, -files/4.5.21.2/shorewall-lite.confd, + -files/4.5.21.2/shorewall-lite.initd, -files/4.5.21.2/shorewall-lite.systemd, + -files/4.5.21.2/shorewallrc, -files/4.5.21.4/shorewall-lite.confd, + -files/4.5.21.4/shorewall-lite.initd, -files/4.5.21.4/shorewall-lite.systemd, + -files/4.5.21.4/shorewallrc, -files/shorewall-lite, + -files/shorewall-lite.systemd, -files/shorewallrc_new, + -shorewall-lite-4.5.18.ebuild, -shorewall-lite-4.5.19.ebuild, + -shorewall-lite-4.5.21.2.ebuild, -shorewall-lite-4.5.21.4.ebuild: + Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de> + +*shorewall-core-4.5.21.9 (26 Apr 2014) + + 26 Apr 2014; Markos Chandras <hwoarang@gentoo.org> + +files/4.5.21.9/shorewallrc, +shorewall-core-4.5.21.9.ebuild, + -files/4.5.19/shorewallrc, -files/4.5.21.2/shorewallrc, + -files/4.5.21.4/shorewallrc, -files/shorewallrc_new, + -shorewall-core-4.5.18.ebuild, -shorewall-core-4.5.19.ebuild, + -shorewall-core-4.5.21.2.ebuild, -shorewall-core-4.5.21.4.ebuild: + Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de> + +*shorewall6-4.5.21.9 (26 Apr 2014) + + 26 Apr 2014; Markos Chandras <hwoarang@gentoo.org> + +files/4.5.21.9/shorewall6.confd, +files/4.5.21.9/shorewall6.initd, + +files/4.5.21.9/shorewall6.systemd, +files/4.5.21.9/shorewallrc, + +shorewall6-4.5.21.9.ebuild, -files/4.5.19/shorewall6.conf-SUBSYSLOCK.patch, + -files/4.5.19/shorewall6.confd, -files/4.5.19/shorewall6.initd, + -files/4.5.19/shorewall6.systemd, -files/4.5.19/shorewallrc, + -files/4.5.21.2/shorewall6.confd, -files/4.5.21.2/shorewall6.initd, + -files/4.5.21.2/shorewall6.systemd, -files/4.5.21.2/shorewallrc, + -files/4.5.21.4/shorewall6.confd, -files/4.5.21.4/shorewall6.initd, + -files/4.5.21.4/shorewall6.systemd, -files/4.5.21.4/shorewallrc, + -files/shorewall6.initd, -files/shorewall6.systemd, -files/shorewallrc_new, + -shorewall6-4.5.18.ebuild, -shorewall6-4.5.19.ebuild, + -shorewall6-4.5.21.2.ebuild, -shorewall6-4.5.21.4.ebuild: + Version bump. Remove old. Bug #508396 thanks to Thomas D. <whissi@whissi.de> +
