Hi, Am Dienstag, Februar 02, 2021 00:34 CET, schrieb Stuart Henderson <[email protected]>:
> On 2021/02/01 23:20, Sebastian Reitenbach wrote: > > Hi Stuart, > > > > Am Montag, Februar 01, 2021 17:20 CET, schrieb Stuart Henderson > > <[email protected]>: > > > > > > > > > > - EPOCH=0 on stegseek because the version number is "higher" than that > > > of stegcracker > > > > > > - quirks $stem_extensions entry to rename the package > > > > > > - @pkgpath security/stegcracker in stegseek/pkg/PLIST > > > > > > > The stem_extensions in the quirks were my missing link. > > I also had to add @conflict marker, so in order to remove stegcracker when > > updating. > > Without it, it recognized that it has to update it, but in the end kept > > both installed. > > @conflict is not needed. I think you tested with "make update" which > is only best-efforts, and doesn't cover complex update cases. > > To test upgrade paths, install the old packages, place the new packages > and new quirks package on their own in a directory (say /tmp/test), and > run "env PKG_PATH=/tmp/test TRUSTED_PKG_PATH=/tmp/test pkg_add -u". > It correctly updates and removes the old package. indeed, I did make update, following your advice above, it works like a charm without @conflict. > > (I should put that paragraph in an editor macro ;) > > > Also incorporated your patch you had in the other mail. Additionally had to > > include security/mhash > > in LIB_DEPENDS, as it also links against libmhash. > > > > Below the quirks that made the update work for me, and the updated tarball > > of the stegseek port attached. > > > > Now OK? > > I missed it before but, > > - it's forcing -O3 via src/CMakeLists.txt, it doesn't seem to allow > overrides so I think that will need patching > > - there are C++ libraries in WANTLIB without setting COMPILER > so please set COMPILER=base-clang ports-gcc (it doesn't build with base-gcc) > portcheck picks up this problem > hope that's the final iteration, updated tarball attached, COMPILER line as well as a patch to remove the -O3 enforcement. cheers, Sebastian > > > cheers, > > Sebastian > > > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/devel/quirks/Makefile,v > > retrieving revision 1.1146 > > diff -u -r1.1146 Makefile > > --- Makefile 1 Feb 2021 14:07:52 -0000 1.1146 > > +++ Makefile 1 Feb 2021 22:15:28 -0000 > > @@ -5,7 +5,7 @@ > > DISTFILES = > > > > # API.rev > > -PKGNAME = quirks-3.534 > > +PKGNAME = quirks-3.535 > > PKG_ARCH = * > > MAINTAINER = Marc Espie <[email protected]> > > > > Index: files/Quirks.pm > > =================================================================== > > RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v > > retrieving revision 1.1162 > > diff -u -r1.1162 Quirks.pm > > --- files/Quirks.pm 1 Feb 2021 14:07:52 -0000 1.1162 > > +++ files/Quirks.pm 1 Feb 2021 22:15:29 -0000 > > @@ -541,6 +541,7 @@ > > 'icinga-web' => 'icinga-web2', > > 'icinga-cgi' => 'icinga-web2', > > 'icinga-idoutils' => 'icinga2-ido-mysql', > > + 'stegcracker' => 'stegseek', > > }; > > > > my $obsolete_reason = { > >
stegseek.tar.gz
Description: GNU Zip compressed data
