Bug 175621 - update net/dhcpcd
Summary: update net/dhcpcd
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Xin LI
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-01-27 06:00 UTC by John Hein
Modified: 2013-10-29 05:40 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (3.22 KB, patch)
2013-01-27 06:00 UTC, John Hein
no flags Details | Diff
dhcpcd.freebsd.rc.d (232 bytes, text/x-shellscript)
2013-02-17 16:24 UTC, roy
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description John Hein 2013-01-27 06:00:01 UTC
This port hasn't been updated in a long time.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-01-27 06:00:09 UTC
Maintainer of net/dhcpcd,

Please note that PR ports/175621 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/175621

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-01-27 06:00:10 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 roy 2013-01-27 09:01:56 UTC
Patch looks fine


Sent from Samsung MobileEdwin Groothuis <edwin@FreeBSD.org> wrote:Maintainer of net/dhcpcd,

Please note that PR ports/175621 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/175621

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org

Comment 4 Raphael Kubo da Costa freebsd_committer freebsd_triage 2013-02-03 20:55:06 UTC
Is the CONFIGURE_ARGS line really necessary? bsd.port.mk already passes
`--mandir=${MANPREFIX}/man' by default.
Comment 5 John Hein 2013-02-10 05:01:17 UTC
Raphael Kubo da Costa wrote at 22:55 +0200 on Feb  3, 2013:
 > Is the CONFIGURE_ARGS line really necessary? bsd.port.mk already passes
 > `--mandir=${MANPREFIX}/man' by default.

That is only added to CONFIGURE_ARGS if configure --help | grep --
--mandir returns a positive result.

However, the configure script that is included in the current dhcpcd
distribution does not.  It's not a autoconf generated configure
script.  But it's close (and I want other things that GNU_CONFIGURE in
bsd.port.mk provides, such as --prefix and --build for cross builds,
etc.).  We could just as well use HAS_CONFIGURE instead of
GNU_CONFIGURE and provide --prefix, etc., manually in addition to
--mandir.  But I chose to use GNU_CONFIGURE and add --mandir manually.

We could add a comment explaining it since it's a bit abnormal...

# current configure script won't trigger the bits in bsd.port.mk to add
# --mandir, so do it manually here
CONFIGURE_ARGS+= --mandir=${PREFIX}/man

No response from maintainer now for a couple weeks.
Comment 6 roy 2013-02-10 10:18:18 UTC
I can spend some time later next week so that the next dhcpcd version works by default. 

Thanks

Roy


Sent from Samsung Mobile

-------- Original message --------
From: John Hein <jhein@symmetricom.com> 
Date:  
To: Raphael Kubo da Costa <rakuco@FreeBSD.org> 
Cc: bug-followup@FreeBSD.org,Roy Marples <roy@marples.name> 
Subject: Re: ports/175621: update net/dhcpcd 
 
Raphael Kubo da Costa wrote at 22:55 +0200 on Feb  3, 2013:
> Is the CONFIGURE_ARGS line really necessary? bsd.port.mk already passes
> `--mandir=${MANPREFIX}/man' by default.

That is only added to CONFIGURE_ARGS if configure --help | grep --
--mandir returns a positive result.

However, the configure script that is included in the current dhcpcd
distribution does not.  It's not a autoconf generated configure
script.  But it's close (and I want other things that GNU_CONFIGURE in
bsd.port.mk provides, such as --prefix and --build for cross builds,
etc.).  We could just as well use HAS_CONFIGURE instead of
GNU_CONFIGURE and provide --prefix, etc., manually in addition to
--mandir.  But I chose to use GNU_CONFIGURE and add --mandir manually.

We could add a comment explaining it since it's a bit abnormal...

# current configure script won't trigger the bits in bsd.port.mk to add
# --mandir, so do it manually here
CONFIGURE_ARGS+= --mandir=${PREFIX}/man

No response from maintainer now for a couple weeks.

Comment 7 John Hein 2013-02-10 15:30:27 UTC
Okay.  Thanks, Roy.

It's not a big deal to work around some build corners in the port.  So
we could commit the support for the long overdue update now.  Then you
could tweak dhcpcd at your leisure.  But it's okay to wait a week for
a minor upstream update, too - it's been 5 years since the last update
to the freebsd port - one more week won't hurt.

Roy Marples wrote at 10:18 +0000 on Feb 10, 2013:
 > I can spend some time later next week so that the next dhcpcd
 > version works by default.
 >
 > Thanks
 >
 > -------- Original message --------
 > From: John Hein <jhein@symmetricom.com>
 > Date:
 > To: Raphael Kubo da Costa <rakuco@FreeBSD.org>
 > Cc: bug-followup@FreeBSD.org,Roy Marples <roy@marples.name>
 > Subject: Re: ports/175621: update net/dhcpcd
 >
 > Raphael Kubo da Costa wrote at 22:55 +0200 on Feb  3, 2013:
 > > Is the CONFIGURE_ARGS line really necessary? bsd.port.mk already passes
 > > `--mandir=${MANPREFIX}/man' by default.
 >
 > That is only added to CONFIGURE_ARGS if configure --help | grep --
 > --mandir returns a positive result.
 >
 > However, the configure script that is included in the current dhcpcd
 > distribution does not.  It's not a autoconf generated configure
 > script.  But it's close (and I want other things that GNU_CONFIGURE in
 > bsd.port.mk provides, such as --prefix and --build for cross builds,
 > etc.).  We could just as well use HAS_CONFIGURE instead of
 > GNU_CONFIGURE and provide --prefix, etc., manually in addition to
 > --mandir.  But I chose to use GNU_CONFIGURE and add --mandir manually.
 >
 > We could add a comment explaining it since it's a bit abnormal...
 >
 > # current configure script won't trigger the bits in bsd.port.mk to add
 > # --mandir, so do it manually here
 > CONFIGURE_ARGS+= --mandir=${PREFIX}/man
 >
 > No response from maintainer now for a couple weeks.
 >
Comment 8 roy 2013-02-17 16:24:27 UTC
On 10/02/2013 15:30, John Hein wrote:
> Okay.  Thanks, Roy.
>
> It's not a big deal to work around some build corners in the port.  
> So
> we could commit the support for the long overdue update now.  Then 
> you
> could tweak dhcpcd at your leisure.  But it's okay to wait a week for
> a minor upstream update, too - it's been 5 years since the last 
> update
> to the freebsd port - one more week won't hurt.

http://roy.marples.name/cgi-bin/gitweb.cgi?p=dhcpcd.git;a=commitdiff;h=0b5d44dd9348722211bcd997a8450a25164ab990;hp=1dd01bfa50d1eefe0b717406db3ce8ed411be334

It's also worth noting that dhcpcd-5.x can now be run as a single 
daemon for all interfaces and I use the following script installed as 
/etc/rc.d/dhcpcd
Under FreeBSD some work does need to be done though to try and avoid 
running on interfaces for which DHCP won't work such as directly on 
iwi(4).

Per interface configuration now happend in dhcpcd.conf(5) which I think 
that package needs to be modified to install the one that ships.

I'm currently awaiting feedback on a new bug found and will hopefully 
release a new package next week based on the results.

dhcpcd-5.99.x branch is also a DHCPv6 client and should be declared a 
stable version (well, enough for general testing) in a month or two.

Lastly, some needs to chase up on a bug report I filed a few years ago, 
kern/131536 which can be a potential problem for dhcpcd.

Thanks

Roy
Comment 9 Po-Chien Lin freebsd_committer freebsd_triage 2013-02-25 13:20:43 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pclin

I'll take it.
Comment 10 Xin LI freebsd_committer freebsd_triage 2013-10-24 06:18:06 UTC
State Changed
From-To: feedback->open

Takeover this. 


Comment 11 Xin LI freebsd_committer freebsd_triage 2013-10-24 06:18:06 UTC
Responsible Changed
From-To: pclin->delphij

Takeover this.
Comment 12 Xin LI freebsd_committer freebsd_triage 2013-10-29 05:37:59 UTC
State Changed
From-To: open->closed

Committed, thanks!
Comment 13 dfilter service freebsd_committer freebsd_triage 2013-10-29 05:38:01 UTC
Author: delphij
Date: Tue Oct 29 05:37:53 2013
New Revision: 331929
URL: http://svnweb.freebsd.org/changeset/ports/331929

Log:
  Update to 5.5.6.
  
  PR:		ports/175621
  Submitted by:	John Hein <jhein symmetricom com>
  Approved by:	maintainer

Added:
  head/net/dhcpcd/files/patch-configure   (contents, props changed)
  head/net/dhcpcd/pkg-plist   (contents, props changed)
Modified:
  head/net/dhcpcd/Makefile
  head/net/dhcpcd/distinfo

Modified: head/net/dhcpcd/Makefile
==============================================================================
--- head/net/dhcpcd/Makefile	Tue Oct 29 02:54:44 2013	(r331928)
+++ head/net/dhcpcd/Makefile	Tue Oct 29 05:37:53 2013	(r331929)
@@ -2,20 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	dhcpcd
-PORTVERSION=	3.2.3
+PORTVERSION=	5.5.6
 CATEGORIES=	net
-MASTER_SITES=	http://roy.marples.name/dhcpcd/ \
-		http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/
+MASTER_SITES=	http://roy.marples.name/downloads/dhcpcd/ \
+		LOCAL/delphij
 
 MAINTAINER=	roy@marples.name
 COMMENT=	DHCP client
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_RC_SUBR=	dhcpcd
 
-MAN8=		dhcpcd.8
-PLIST_FILES=	sbin/dhcpcd
-
 NO_STAGE=	yes
+
+CONFIGURE_ARGS+= --mandir=${PREFIX}/man
+
+MAN5=		dhcpcd.conf.5
+MAN8=		dhcpcd.8 dhcpcd-run-hooks.8
+
 .include <bsd.port.mk>

Modified: head/net/dhcpcd/distinfo
==============================================================================
--- head/net/dhcpcd/distinfo	Tue Oct 29 02:54:44 2013	(r331928)
+++ head/net/dhcpcd/distinfo	Tue Oct 29 05:37:53 2013	(r331929)
@@ -1,2 +1,2 @@
-SHA256 (dhcpcd-3.2.3.tar.bz2) = 89d5fc05d7fd643200333116400d8a0eda9adf1c7f2a70e6cbca977c8d3843fe
-SIZE (dhcpcd-3.2.3.tar.bz2) = 45030
+SHA256 (dhcpcd-5.5.6.tar.bz2) = 657f10dc7de48cba9f7170b593bf0e11987d06bd12378e3f4cd01b9e99b1e8e7
+SIZE (dhcpcd-5.5.6.tar.bz2) = 78185

Added: head/net/dhcpcd/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/dhcpcd/files/patch-configure	Tue Oct 29 05:37:53 2013	(r331929)
@@ -0,0 +1,30 @@
+--- ./configure.orig	2012-03-28 03:26:20.000000000 -0700
++++ ./configure	2013-10-28 22:31:50.000000000 -0700
+@@ -53,7 +53,7 @@
+ 	--includedir) eval INCLUDEDIR="$INCLUDEDIR${INCLUDEDIR:+ }$var";;
+ 	--datadir|--infodir) ;; # ignore autotools
+ 	--disable-maintainer-mode|--disable-dependency-tracking) ;;
+-	--help) echo "See the README file for available options"; exit 0;;
++	--help|--version) echo "See the README file for available options"; exit 0;;
+ 	*) echo "$0: WARNING: unknown option $opt" >&2;;
+ 	esac
+ done
+@@ -101,7 +101,8 @@
+ CONFIG_MK=config.mk
+ 
+ if [ -z "$BUILD" ]; then
+-	BUILD=`uname -m`-`uname -s | tr '[:upper:]' '[:lower:]'`
++	# autoconf target triplet: cpu-vendor-os (where os = system or kernel-system)
++	BUILD=`uname -m`-unknown-`uname -s | tr '[:upper:]' '[:lower:]'`
+ fi
+ if [ -z "$HOST" ]; then
+ 	[ -z "$TARGET" ] && TARGET=$BUILD
+@@ -124,6 +125,8 @@
+ 	# Derive OS from cpu-manufacturer-os-kernel
+ 	CPU=${TARGET%%-*}
+ 	REST=${TARGET#*-}
++	VENDOR=${REST%%-*}
++	REST=${REST#*-}
+ 	if [ "$CPU" != "$REST" ]; then
+ 		MANU=${REST%%-*}
+ 		REST=${REST#*-}

Added: head/net/dhcpcd/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/dhcpcd/pkg-plist	Tue Oct 29 05:37:53 2013	(r331929)
@@ -0,0 +1,12 @@
+@comment $FreeBSD$
+etc/dhcpcd.conf
+sbin/dhcpcd
+libexec/dhcpcd-hooks/50-ypbind
+libexec/dhcpcd-hooks/10-mtu
+libexec/dhcpcd-hooks/20-resolv.conf
+libexec/dhcpcd-hooks/50-ntp.conf
+libexec/dhcpcd-hooks/02-dump
+libexec/dhcpcd-hooks/30-hostname
+libexec/dhcpcd-hooks/01-test
+libexec/dhcpcd-hooks/29-lookup-hostname
+libexec/dhcpcd-run-hooks
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"