Update foreman-proxy to 1.5.1

5 files changed, 40 insertions, 24 deletions

diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
index 32c8a6ae6cbb..b07dccb0f0df 100644
--- a/net/foreman-proxy/Makefile
+++ b/net/foreman-proxy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	foreman-proxy
-PORTVERSION=	1.4.1
+PORTVERSION=	1.5.1
 CATEGORIES=	net
 MASTER_SITES=	GH
 
@@ -21,7 +21,7 @@ PUPPET_DESC=	Depend on Puppet
 USE_GITHUB=	yes
 GH_ACCOUNT=	theforeman
 GH_PROJECT=	smart-proxy
-GH_COMMIT= 	b3e190d
+GH_COMMIT= 	2924287
 USE_RUBY=	yes
 USE_RAKE=	yes
 USE_RC_SUBR=	foreman-proxy
@@ -76,10 +76,10 @@ do-install:
 .for file in Rakefile config.ru lib public views
 	@${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \
+	${INSTALL} ${COPY} -m 644 ${WRKSRC}/config/settings.yml.example \
 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample
 .if !exists(${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml)
-	@${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \
+	@${INSTALL} ${COPY} -m 644 ${WRKSRC}/config/settings.yml.example \
 		${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml
 .endif
 
diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo
index 09b33d561554..305ad7ea742f 100644
--- a/net/foreman-proxy/distinfo
+++ b/net/foreman-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (foreman-proxy-1.4.1.tar.gz) = 5404f88f428cade97ae9fc08a4670a5219fe8302b0d879747905864a2a59f712
-SIZE (foreman-proxy-1.4.1.tar.gz) = 85109
+SHA256 (foreman-proxy-1.5.1.tar.gz) = d3b5012b4db87c957b1707fdb8c26d539b3d8ff82601b6b688f02d2fd8b5c3ac
+SIZE (foreman-proxy-1.5.1.tar.gz) = 90017
diff --git a/net/foreman-proxy/files/patch-config-settings.yml.example b/net/foreman-proxy/files/patch-config-settings.yml.example
index e9b945cc6987..3d6c700a2caf 100644
--- a/net/foreman-proxy/files/patch-config-settings.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.yml.example
@@ -1,5 +1,5 @@
---- config/settings.yml.example.orig	2014-01-28 19:55:58.769179974 +0100
-+++ config/settings.yml.example	2014-01-28 20:06:51.840135157 +0100
+--- config/settings.yml.example.orig	2014-06-18 10:54:21.000000000 +0200
++++ config/settings.yml.example	2014-06-19 15:42:56.264085917 +0200
 @@ -23,7 +23,7 @@
  
  # Enable TFTP management
@@ -14,7 +14,7 @@
  #   virsh (simple implementation for libvirt)
  :dns_provider: nsupdate
 -#:dns_key: /etc/rndc.key
-+#:dns_key: /usr/local/etc/namedb/rndc.key
++#:dns_key: %%LOCALBASE%%/etc/namedb/rndc.key
  # use this setting if you are managing a dns server which is not localhost though this proxy
  #:dns_server: dns.domain.com
  # use this setting if you want to override default TTL setting (86400)
@@ -22,12 +22,12 @@
  # use dns_tsig_* for GSS-TSIG updates using Kerberos.  Required for Windows MS DNS with
  # Secure Dynamic Updates, or BIND as used in FreeIPA.  Set dns_provider to nsupdate_gss.
 -#:dns_tsig_keytab: /usr/share/foreman-proxy/dns.keytab
-+#:dns_tsig_keytab: /usr/local/share/foreman-proxy/dns.keytab
++#:dns_tsig_keytab: %%PREFIX%%/share/foreman-proxy/dns.keytab
  #:dns_tsig_principal: DNS/host.example.com@EXAMPLE.COM
  
  # Enable DHCP management
 @@ -55,15 +55,8 @@
- # dhcp_subnets is a Native MS implementation setting. It restricts the subnets queried to a
+ # dhcp_subnets is an ISC &  Native MS implementation setting. It restricts the subnets queried to a
  # subset, so as to reduce the query time.
  #:dhcp_subnets: [192.168.205.0/255.255.255.128, 192.168.205.128/255.255.255.128]
 -# Settings for Ubuntu ISC
@@ -44,7 +44,7 @@
  #:dhcp_key_name: secret_key_name
  #:dhcp_key_secret: secret_key
  
-@@ -72,8 +65,8 @@
+@@ -72,10 +65,10 @@
  
  # enable PuppetCA management
  :puppetca: false
@@ -52,10 +52,13 @@
 -#:puppetdir: /etc/puppet
 +#:ssldir: /var/puppet/ssl
 +#:puppetdir: %%LOCALBASE%%/etc/puppet
+ #:puppetca_use_sudo: true
+-#:sudo_command: /usr/bin/sudo
++#:sudo_command: %%LOCALBASE%%/bin/sudo
  
  # enable Puppet management
  :puppet: false
-@@ -87,19 +80,19 @@
+@@ -89,19 +82,19 @@
  
  # customrun command details
  # Set :customrun_cmd to the full path of the script you want to run, instead of /bin/false
@@ -79,7 +82,7 @@
  
  # Which user to invoke sudo as to run puppet commands
  #:puppet_user: root
-@@ -111,7 +104,7 @@
+@@ -113,7 +106,7 @@
  # smart-proxy client node needs to have some admin right on chef-server
  # in order to retrive all nodes public keys
  # :chef_smartproxy_clientname: 'host.example.net'
@@ -88,3 +91,12 @@
  
  # enable BMC management  (Bare metal power and bios controls)
  # Available providers:
+@@ -130,7 +123,7 @@
+ :realm_provider: freeipa
+ 
+ # Authentication for Kerberos-based Realms
+-:realm_keytab: /etc/foreman-proxy/freeipa.keytab
++:realm_keytab: %%PREFIX%%/etc/foreman-proxy/freeipa.keytab
+ :realm_principal: realm-proxy@EXAMPLE.COM
+ 
+ # FreeIPA specific settings
diff --git a/net/foreman-proxy/files/patch-lib-proxy-tftp.rb b/net/foreman-proxy/files/patch-lib-proxy-tftp.rb
index d2c32dcd70a9..eefd532a16c1 100644
--- a/net/foreman-proxy/files/patch-lib-proxy-tftp.rb
+++ b/net/foreman-proxy/files/patch-lib-proxy-tftp.rb
@@ -1,14 +1,14 @@
---- lib/proxy/tftp.rb.orig	2014-01-29 11:01:36.000000000 +0100
-+++ lib/proxy/tftp.rb	2014-02-08 12:38:15.087475784 +0100
-@@ -105,8 +105,9 @@
+--- lib/proxy/tftp.rb.orig	2014-06-18 10:54:21.000000000 +0200
++++ lib/proxy/tftp.rb	2014-06-19 15:34:09.887122187 +0200
+@@ -107,8 +107,9 @@
        # as the dst might contain another sub directory
        FileUtils.mkdir_p destination.parent
  
 -      wget = which("wget")
--      cmd = "#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c #{src} -O \"#{destination}\""
-+      # wget = which("wget")
-+      # cmd = "#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c #{src} -O \"#{destination}\""
-+      cmd = "/usr/bin/fetch --timeout=10 --no-verify-hostname --no-verify-peer -a -m -q -o \"#{destination}\" #{src}"
+-      cmd = "#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c \"#{escape_for_shell(src.to_s)}\" -O \"#{escape_for_shell(destination.to_s)}\""
++#      wget = which("wget")
++#      cmd = "#{wget} --timeout=10 --tries=3 --no-check-certificate -nv -c \"#{escape_for_shell(src.to_s)}\" -O \"#{escape_for_shell(destination.to_s)}\""
++      cmd = "/usr/bin/fetch --timeout=10 --no-verify-hostname --no-verify-peer -a -m -q -o \"#{escape_for_shell(destination.to_s)}\" \"#{escape_for_shell(src.to_s)}\""
        CommandTask.new(cmd)
      end
    end
diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist
index 05bccbf9bee0..8094f264f3fa 100644
--- a/net/foreman-proxy/pkg-plist
+++ b/net/foreman-proxy/pkg-plist
@@ -1,7 +1,5 @@
 sbin/smart-proxy
-@unexec if cmp -s %D/etc/foreman-proxy/settings.yml %D/etc/foreman-proxy/settings.yml.sample; then rm -f %D/etc/foreman-proxy/settings.yml; fi
-etc/foreman-proxy/settings.yml.sample
-@exec [ -f %B/settings.yml ] || cp %B/%f %B/settings.yml
+@sample etc/foreman-proxy/settings.yml.sample
 %%DATADIR%%/Rakefile
 %%DATADIR%%/config.ru
 %%DATADIR%%/config
@@ -40,10 +38,12 @@ etc/foreman-proxy/settings.yml.sample
 %%DATADIR%%/lib/proxy/dns/nsupdate_gss.rb
 %%DATADIR%%/lib/proxy/dns/virsh.rb
 %%DATADIR%%/lib/proxy/error.rb
+%%DATADIR%%/lib/proxy/kerberos.rb
 %%DATADIR%%/lib/proxy/log.rb
 %%DATADIR%%/lib/proxy/puppet.rb
 %%DATADIR%%/lib/proxy/puppet/class_scanner.rb
 %%DATADIR%%/lib/proxy/puppet/class_scanner_eparser.rb
+%%DATADIR%%/lib/proxy/puppet/config_reader.rb
 %%DATADIR%%/lib/proxy/puppet/customrun.rb
 %%DATADIR%%/lib/proxy/puppet/default_puppet_settings.rb
 %%DATADIR%%/lib/proxy/puppet/environment.rb
@@ -54,6 +54,8 @@ etc/foreman-proxy/settings.yml.sample
 %%DATADIR%%/lib/proxy/puppet/puppetrun.rb
 %%DATADIR%%/lib/proxy/puppet/salt.rb
 %%DATADIR%%/lib/proxy/puppetca.rb
+%%DATADIR%%/lib/proxy/realm.rb
+%%DATADIR%%/lib/proxy/realm/freeipa.rb
 %%DATADIR%%/lib/proxy/settings.rb
 %%DATADIR%%/lib/proxy/tftp.rb
 %%DATADIR%%/lib/proxy/util.rb
@@ -61,6 +63,7 @@ etc/foreman-proxy/settings.yml.sample
 %%DATADIR%%/lib/proxy/virsh.rb
 %%DATADIR%%/lib/puppet_api.rb
 %%DATADIR%%/lib/puppetca_api.rb
+%%DATADIR%%/lib/realm_api.rb
 %%DATADIR%%/lib/sinatra-patch.rb
 %%DATADIR%%/lib/smart_proxy.rb
 %%DATADIR%%/lib/tftp_api.rb
@@ -80,6 +83,7 @@ etc/foreman-proxy/settings.yml.sample
 @dirrm %%DATADIR%%/lib/proxy/dhcp
 @dirrm %%DATADIR%%/lib/proxy/dns
 @dirrm %%DATADIR%%/lib/proxy/puppet
+@dirrm %%DATADIR%%/lib/proxy/realm
 @dirrm %%DATADIR%%/lib/proxy
 @dirrm %%DATADIR%%/lib
 @dirrmtry %%DATADIR%%