Attachment 117579 Details for Bug 159670 – patch

[patch] patch

patch (text/plain), 4.13 KB, created by Russell Jackson on 2011-08-12 19:33:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Russell Jackson

Created: 2011-08-12 19:33:56 UTC

Size: 4.13 KB

patch

obsolete

>diff --git puppet/Makefile puppet/Makefile
>index 014d9d6..7b1aff7 100644
>--- puppet/Makefile
>+++ puppet/Makefile
>@@ -6,23 +6,23 @@
> #
> 
> PORTNAME=	puppet
>-PORTVERSION=	2.6.7
>+DISTVERSION=	2.7.3rc1
> CATEGORIES=	sysutils
>-MASTER_SITES=	http://www.puppetlabs.com/downloads/puppet/
>+MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
> 
> MAINTAINER=	raj@csub.edu
> COMMENT=	A configuration management framework written in Ruby
> 
>-RUN_DEPENDS=	${RUBY_SITELIBDIR}/facter.rb:${PORTSDIR}/sysutils/facter \
>-		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas \
>-		${RUBY_ARCHLIBDIR}/iconv.so:${PORTSDIR}/converters/ruby-iconv
>+RUN_DEPENDS=	facter>=0:${PORTSDIR}/sysutils/facter \
>+		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas
> 
> CONFLICTS=	puppet-devel-[0-9]*
> 
> NO_BUILD=	yes
> USE_RUBY=	yes
>+USE_RUBY_FEATURES=	iconv
> USE_RC_SUBR=	puppet puppetmaster
>-PORTDOCS=	CHANGELOG README LICENSE COPYING
>+PORTDOCS=	CHANGELOG LICENSE README.md
> PORTEXAMPLES=	*
> PUPPET_USER:=	puppet
> PUPPET_GROUP:=	${PUPPET_USER}
>@@ -37,7 +37,16 @@ SUB_LIST+=	PUPPET_USER="${PUPPET_USER}" \
> MANCOMPRESSED=	yes
> MAN5=	puppet.conf.5
> MAN8=	filebucket.8 pi.8 puppet.8 puppetca.8 puppetd.8 \
>-	puppetdoc.8 puppetmasterd.8 puppetrun.8 ralsh.8 puppetqd.8
>+	puppetdoc.8 puppetmasterd.8 puppetrun.8 ralsh.8 puppetqd.8 \
>+	puppet-agent.8 puppet-apply.8 puppet-catalog.8 puppet-cert.8 \
>+	puppet-certificate.8 puppet-certificate_request.8 \
>+	puppet-certificate_revocation_list.8 puppet-config.8 \
>+	puppet-describe.8 puppet-device.8 puppet-doc.8 puppet-facts.8 \
>+	puppet-file.8 puppet-filebucket.8 puppet-help.8 puppet-inspect.8 \
>+	puppet-key.8 puppet-kick.8 puppet-man.8 puppet-master.8 \
>+	puppet-node.8 puppet-parser.8 puppet-plugin.8 puppet-queue.8 \
>+	puppet-report.8 puppet-resource.8 puppet-resource_type.8 \
>+	puppet-secret_agent.8 puppet-status.8
> 
> OPTIONS=	MONGREL		"Run puppet server as a mongrel service"	Off \
> 		PACKAGE_ORIGIN	"Use port origin as package name"		On
>@@ -50,7 +59,7 @@ RUN_DEPENDS+=	rubygem-mongrel>=0:${PORTSDIR}/www/rubygem-mongrel
> 
> .if defined(WITH_PACKAGE_ORIGIN)
> EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
>-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bz2.so:${PORTSDIR}/archivers/ruby-bz2
>+RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
> .endif
> 
> .include <bsd.port.pre.mk>
>@@ -86,6 +95,8 @@ post-install:
> 		> ${ETCDIR}/puppet.conf-dist
> 	@${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \
> 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
>+	@${ECHO} ${RUBY_SITELIBDIR}/semver.rb | \
>+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
> 	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
> 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
> 	@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
>diff --git puppet/distinfo puppet/distinfo
>index 17dcc99..424ccaf 100644
>--- puppet/distinfo
>+++ puppet/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (puppet-2.6.7.tar.gz) = 90c0741f66d15716cfd76f0b8cd15f5b867056f0180ba160ce868350c6dd4ddc
>-SIZE (puppet-2.6.7.tar.gz) = 1530756
>+SHA256 (puppet-2.7.3rc1.tar.gz) = c1d0a08114f94b727b33d18cec60232ae7b48f107fd23495706e0444c5377036
>+SIZE (puppet-2.7.3rc1.tar.gz) = 1710547
>diff --git puppet/files/optpatch-package_origin puppet/files/optpatch-package_origin
>index e1cef54..b3a678e 100644
>--- puppet/files/optpatch-package_origin
>+++ puppet/files/optpatch-package_origin
>@@ -1,5 +1,5 @@
> diff --git lib/puppet/provider/package/freebsd.rb lib/puppet/provider/package/freebsd.rb
>-index e10a20b..f36e29e 100755
>+index e10a20b..7f50e10 100755
> --- lib/puppet/provider/package/freebsd.rb
> +++ lib/puppet/provider/package/freebsd.rb
> @@ -1,37 +1,165 @@
>@@ -11,7 +11,7 @@ index e10a20b..f36e29e 100755
> -    libraries."
> +require 'open-uri'
> +require 'net/ftp'
>-+require 'bz2'
>++require 'bzip2'
>  
> -  commands :pkginfo => "/usr/sbin/pkg_info",
> -    :pkgadd => "/usr/sbin/pkg_add",
>@@ -99,7 +99,7 @@ index e10a20b..f36e29e 100755
> +        Puppet.debug "Fetching INDEX: #{uri.inspect}"
> +        begin
> +          open(uri, "r") do |f|
>-+            BZ2::Reader.open(f.path) do |f|
>++            Bzip2::Reader.open(f.path) do |f|
> +              while (line = f.gets)
> +                fields = line.split("|")
> +                pkg_info = self.class.parse_pkg_string(fields[0])

Actions: View | Diff

Attachments on bug 159670: 117578 | 117579