Re: replace security/stegcracker with security/stegseek
Hi,
Am Dienstag, Februar 02, 2021 00:34 CET, schrieb Stuart Henderson
:
> On 2021/02/01 23:20, Sebastian Reitenbach wrote:
> > Hi Stuart,
> >
> > Am Montag, Februar 01, 2021 17:20 CET, schrieb Stuart Henderson
> > :
> >
> >
> > >
> > > - 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
> > --- Makefile1 Feb 2021 14:07:52 - 1.1146
> > +++ Makefile1 Feb 2021 22:15:28 -
> > @@ -5,7 +5,7 @@
> > DISTFILES =
> >
> > # API.rev
> > -PKGNAME = quirks-3.534
> > +PKGNAME = quirks-3.535
> > PKG_ARCH = *
> > MAINTAINER = Marc Espie
> >
> > 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 - 1.1162
> > +++ files/Quirks.pm 1 Feb 2021 22:15:29 -
> > @@ -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
Re: replace security/stegcracker with security/stegseek
On 2021/02/01 23:20, Sebastian Reitenbach wrote:
> Hi Stuart,
>
> Am Montag, Februar 01, 2021 17:20 CET, schrieb Stuart Henderson
> :
>
>
> >
> > - 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.
(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
> 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 - 1.1146
> +++ Makefile 1 Feb 2021 22:15:28 -
> @@ -5,7 +5,7 @@
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-3.534
> +PKGNAME =quirks-3.535
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> 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 - 1.1162
> +++ files/Quirks.pm 1 Feb 2021 22:15:29 -
> @@ -541,6 +541,7 @@
> 'icinga-web' => 'icinga-web2',
> 'icinga-cgi' => 'icinga-web2',
> 'icinga-idoutils' => 'icinga2-ido-mysql',
> + 'stegcracker' => 'stegseek',
> };
>
> my $obsolete_reason = {
Re: replace security/stegcracker with security/stegseek
Hi Stuart,
Am Montag, Februar 01, 2021 17:20 CET, schrieb Stuart Henderson
:
>
> - 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.
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?
cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1146
diff -u -r1.1146 Makefile
--- Makefile1 Feb 2021 14:07:52 - 1.1146
+++ Makefile1 Feb 2021 22:15:28 -
@@ -5,7 +5,7 @@
DISTFILES =
# API.rev
-PKGNAME = quirks-3.534
+PKGNAME = quirks-3.535
PKG_ARCH = *
MAINTAINER = Marc Espie
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 - 1.1162
+++ files/Quirks.pm 1 Feb 2021 22:15:29 -
@@ -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: application/gzip
Re: replace security/stegcracker with security/stegseek
On 2021/02/01 07:48, Sebastian Reitenbach wrote: > Hi, > > Am Freitag, Januar 29, 2021 19:22 CET, schrieb Klemens Nanni > : > > > On Thu, Jan 28, 2021 at 11:28:10PM +0100, Sebastian Reitenbach wrote: > > > for the quirks, just use reason 3: "no longer maintained upstream" > > > or add a new one: "no longer maintained upstream, suggest stegseek" ? > > Just add new ones if need be, no need to be less specific. > > > > Will do thanks, > > > But if one replaces the other, why not merge the old into the new one > > and keep users on track? > > you mean to place the stegseek port into the stegcracker directory? > Or is there an easy way with @conflict etc. markers in PLIST ? To do this, you will need: - 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 > > cheers, > Sebastian >
Re: replace security/stegcracker with security/stegseek
Hi,
Am Freitag, Januar 29, 2021 20:25 CET, schrieb Stuart Henderson
:
> On 2021/01/28 23:28, Sebastian Reitenbach wrote:
> > Hi,
> > not long ago, stegcracker was imported. I saw an update is available,
> > looking at it,
> > it says, that's the last version, use stegseek, as that's "lightning fast".
> > Which indeed, it
> > is. So attached a port of stegseek.
> >
> > so, I'd like to get rid of security/stegcracker, and add security/stegseek.
> > Works for me on amd64. The patch helps to make it build, don't know if that
> > would break on non 64bit archs?
> >
> > for the quirks, just use reason 3: "no longer maintained upstream"
> > or add a new one: "no longer maintained upstream, suggest stegseek" ?
> >
> > cheers,
> > Sebastian
>
> Here are some fixes/tidying on top of your Makefile.
Thank you, I'll fix accordingly.
cheers,
Sebastian
>
> --- stegseek.orig/MakefileThu Jan 28 22:25:54 2021
> +++ stegseek/Makefile Fri Jan 29 19:22:35 2021
> @@ -2,27 +2,25 @@
>
> COMMENT =lightning fast steghide cracker
>
> -VERSION =0.5
> GH_ACCOUNT = RickdeJager
> GH_PROJECT = stegseek
> -GH_TAGNAME = v${VERSION}
> -PKGNAME =${GH_PROJECT}-${VERSION}
> +GH_TAGNAME = v0.5
>
> CATEGORIES = security
>
> MAINTAINER = Sebastian Reitenbach
>
> -# GPLv2 or later
> +# GPLv2+
> PERMIT_PACKAGE = Yes
>
> +WANTLIB += ${COMPILER_LIBCXX} c m z jpeg mcrypt mhash
> +
> MODULES = devel/cmake
> -WANTLIB += ${COMPILER_LIBCXX} c m z jpeg mcrypt mhash
>
> LIB_DEPENDS += graphics/jpeg \
> - security/mcrypt
> + security/libmcrypt
>
> CONFIGURE_ARGS =-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include ${CFLAGS}"
> \
> -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
> -
>
> .include
Re: replace security/stegcracker with security/stegseek
Hi, Am Freitag, Januar 29, 2021 19:22 CET, schrieb Klemens Nanni : > On Thu, Jan 28, 2021 at 11:28:10PM +0100, Sebastian Reitenbach wrote: > > for the quirks, just use reason 3: "no longer maintained upstream" > > or add a new one: "no longer maintained upstream, suggest stegseek" ? > Just add new ones if need be, no need to be less specific. > Will do thanks, > But if one replaces the other, why not merge the old into the new one > and keep users on track? you mean to place the stegseek port into the stegcracker directory? Or is there an easy way with @conflict etc. markers in PLIST ? cheers, Sebastian
Re: replace security/stegcracker with security/stegseek
On 2021/01/28 23:28, Sebastian Reitenbach wrote:
> Hi,
> not long ago, stegcracker was imported. I saw an update is available, looking
> at it,
> it says, that's the last version, use stegseek, as that's "lightning fast".
> Which indeed, it
> is. So attached a port of stegseek.
>
> so, I'd like to get rid of security/stegcracker, and add security/stegseek.
> Works for me on amd64. The patch helps to make it build, don't know if that
> would break on non 64bit archs?
>
> for the quirks, just use reason 3: "no longer maintained upstream"
> or add a new one: "no longer maintained upstream, suggest stegseek" ?
>
> cheers,
> Sebastian
Here are some fixes/tidying on top of your Makefile.
--- stegseek.orig/Makefile Thu Jan 28 22:25:54 2021
+++ stegseek/Makefile Fri Jan 29 19:22:35 2021
@@ -2,27 +2,25 @@
COMMENT = lightning fast steghide cracker
-VERSION = 0.5
GH_ACCOUNT = RickdeJager
GH_PROJECT = stegseek
-GH_TAGNAME = v${VERSION}
-PKGNAME = ${GH_PROJECT}-${VERSION}
+GH_TAGNAME = v0.5
CATEGORIES = security
MAINTAINER = Sebastian Reitenbach
-# GPLv2 or later
+# GPLv2+
PERMIT_PACKAGE = Yes
+WANTLIB += ${COMPILER_LIBCXX} c m z jpeg mcrypt mhash
+
MODULES = devel/cmake
-WANTLIB += ${COMPILER_LIBCXX} c m z jpeg mcrypt mhash
LIB_DEPENDS += graphics/jpeg \
- security/mcrypt
+ security/libmcrypt
CONFIGURE_ARGS =-DCMAKE_CXX_FLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
-
.include
Re: replace security/stegcracker with security/stegseek
On Thu, Jan 28, 2021 at 11:28:10PM +0100, Sebastian Reitenbach wrote: > for the quirks, just use reason 3: "no longer maintained upstream" > or add a new one: "no longer maintained upstream, suggest stegseek" ? Just add new ones if need be, no need to be less specific. But if one replaces the other, why not merge the old into the new one and keep users on track?
replace security/stegcracker with security/stegseek
Hi, not long ago, stegcracker was imported. I saw an update is available, looking at it, it says, that's the last version, use stegseek, as that's "lightning fast". Which indeed, it is. So attached a port of stegseek. so, I'd like to get rid of security/stegcracker, and add security/stegseek. Works for me on amd64. The patch helps to make it build, don't know if that would break on non 64bit archs? for the quirks, just use reason 3: "no longer maintained upstream" or add a new one: "no longer maintained upstream, suggest stegseek" ? cheers, Sebastian stegseek.tar.gz Description: application/gzip
