mbox

ntp: Do not use an RPATH.

Message ID 1477048310-17051-1-git-send-email-stefan.schantl@ipfire.org
State Superseded
Headers

Message

Stefan Schantl Oct. 21, 2016, 10:11 p.m. UTC 
  Fixes #11243.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 ntp/ntp.nm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Michael Tremer Oct. 22, 2016, 12:08 a.m. UTC | #1 
This won't compile...

Applying patches...
  Applying /usr/src/packages/ntp-4.2.8-3.ip3.src/patches/ntpstat-0.2-1-clksrc.patch (-N -p1)...
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -up ntp-4.2.4p7/ntpstat-0.2/ntpstat.c.ntpstat ntp-4.2.4p7/ntpstat-0.2/ntpstat.c
|--- ntp-4.2.4p7/ntpstat-0.2/ntpstat.c.ntpstat  2002-06-10 08:02:12.000000000 +0200
|+++ ntp-4.2.4p7/ntpstat-0.2/ntpstat.c  2009-07-20 12:22:35.000000000 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
Command exited with an error: ['bash', '--login', '-c', '/tmp/tmpaBqkiM']

An error has occured when running Pakfire.

Error message:
  BuildError: An unhandled error occured.

Further description:
  Build command has failed.

On Fri, 2016-10-21 at 13:11 +0200, Stefan Schantl wrote:
> Fixes #11243.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> ---
>  ntp/ntp.nm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/ntp/ntp.nm b/ntp/ntp.nm
> index 780ad01..ad4b046 100644
> --- a/ntp/ntp.nm
> +++ b/ntp/ntp.nm
> @@ -6,7 +6,7 @@
>  name       = ntp
>  version    = %{ver_major}.8
>  ver_major  = 4.2
> -release    = 2
> +release    = 3
>  
>  groups     = System/Daemons
>  url        = http://www.ntp.org/
> @@ -49,6 +49,7 @@ build
>  	configure_options += \
>  		--sysconfdir=%{sysconfdir}/ntp/crypto \
>  		--with-openssl-libdir=%{libdir} \
> +		--without-rpath \
>  		--enable-all-clocks \
>  		--enable-parse-clocks \
>  		--enable-ntp-signd=%{localstatedir}/run/ntp_signd
Stefan Schantl Oct. 28, 2016, 10:26 p.m. UTC | #2 
Hello Michael,

tested with "pakfire-builder build ntp.nm -m release" and worked fine.

Best regards,

-Stefan
> This won't compile...
> 
> Applying patches...
>   Applying /usr/src/packages/ntp-4.2.8-3.ip3.src/patches/ntpstat-0.2-
> 1-clksrc.patch (-N -p1)...
> can't find file to patch at input line 4
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> > 
> > diff -up ntp-4.2.4p7/ntpstat-0.2/ntpstat.c.ntpstat ntp-
> > 4.2.4p7/ntpstat-0.2/ntpstat.c
> > --- ntp-4.2.4p7/ntpstat-0.2/ntpstat.c.ntpstat  2002-06-10
> > 08:02:12.000000000 +0200
> > +++ ntp-4.2.4p7/ntpstat-0.2/ntpstat.c  2009-07-20
> > 12:22:35.000000000 +0200
> --------------------------
> File to patch: 
> Skip this patch? [y] 
> Skipping patch.
> 1 out of 1 hunk ignored
> Command exited with an error: ['bash', '--login', '-c',
> '/tmp/tmpaBqkiM']
> 
> An error has occured when running Pakfire.
> 
> Error message:
>   BuildError: An unhandled error occured.
> 
> Further description:
>   Build command has failed.
> 
> On Fri, 2016-10-21 at 13:11 +0200, Stefan Schantl wrote:
> > 
> > Fixes #11243.
> > 
> > Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> > ---
> >  ntp/ntp.nm | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/ntp/ntp.nm b/ntp/ntp.nm
> > index 780ad01..ad4b046 100644
> > --- a/ntp/ntp.nm
> > +++ b/ntp/ntp.nm
> > @@ -6,7 +6,7 @@
> >  name       = ntp
> >  version    = %{ver_major}.8
> >  ver_major  = 4.2
> > -release    = 2
> > +release    = 3
> >  
> >  groups     = System/Daemons
> >  url        = http://www.ntp.org/
> > @@ -49,6 +49,7 @@ build
> >  	configure_options += \
> >  		--sysconfdir=%{sysconfdir}/ntp/crypto \
> >  		--with-openssl-libdir=%{libdir} \
> > +		--without-rpath \
> >  		--enable-all-clocks \
> >  		--enable-parse-clocks \
> >  		--enable-ntp-signd=%{localstatedir}/run/ntp_signd
Stefan Schantl Jan. 12, 2017, 8:30 p.m. UTC | #3 
Since the git tree and the ntp file has been altered, the patch does
not aplly anymore. I'll send a new one which can be applied.

Best regards,

-Stefan
> Hello Michael,
> 
> tested with "pakfire-builder build ntp.nm -m release" and worked
> fine.
> 
> Best regards,
> 
> -Stefan
> > This won't compile...
> > 
> > Applying patches...
> >   Applying /usr/src/packages/ntp-4.2.8-3.ip3.src/patches/ntpstat-
> > 0.2-
> > 1-clksrc.patch (-N -p1)...
> > can't find file to patch at input line 4
> > Perhaps you used the wrong -p or --strip option?
> > The text leading up to this was:
> > --------------------------
> > > 
> > > diff -up ntp-4.2.4p7/ntpstat-0.2/ntpstat.c.ntpstat ntp-
> > > 4.2.4p7/ntpstat-0.2/ntpstat.c
> > > --- ntp-4.2.4p7/ntpstat-0.2/ntpstat.c.ntpstat  2002-06-10
> > > 08:02:12.000000000 +0200
> > > +++ ntp-4.2.4p7/ntpstat-0.2/ntpstat.c  2009-07-20
> > > 12:22:35.000000000 +0200
> > 
> > --------------------------
> > File to patch: 
> > Skip this patch? [y] 
> > Skipping patch.
> > 1 out of 1 hunk ignored
> > Command exited with an error: ['bash', '--login', '-c',
> > '/tmp/tmpaBqkiM']
> > 
> > An error has occured when running Pakfire.
> > 
> > Error message:
> >   BuildError: An unhandled error occured.
> > 
> > Further description:
> >   Build command has failed.
> > 
> > On Fri, 2016-10-21 at 13:11 +0200, Stefan Schantl wrote:
> > > 
> > > Fixes #11243.
> > > 
> > > Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> > > ---
> > >  ntp/ntp.nm | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/ntp/ntp.nm b/ntp/ntp.nm
> > > index 780ad01..ad4b046 100644
> > > --- a/ntp/ntp.nm
> > > +++ b/ntp/ntp.nm
> > > @@ -6,7 +6,7 @@
> > >  name       = ntp
> > >  version    = %{ver_major}.8
> > >  ver_major  = 4.2
> > > -release    = 2
> > > +release    = 3
> > >  
> > >  groups     = System/Daemons
> > >  url        = http://www.ntp.org/
> > > @@ -49,6 +49,7 @@ build
> > >  	configure_options += \
> > >  		--sysconfdir=%{sysconfdir}/ntp/crypto \
> > >  		--with-openssl-libdir=%{libdir} \
> > > +		--without-rpath \
> > >  		--enable-all-clocks \
> > >  		--enable-parse-clocks \
> > >  		--enable-ntp-
> > > signd=%{localstatedir}/run/ntp_signd