Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (bc697718b49c74246889abc5cd405a107ae198b4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (bc697718b49c74246889abc5cd405a107ae198b4)
  • Date: Thu, 4 Dec 2014 19:32:50 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

ChangeLog | 3 +
net/socat/DEPENDS | 2 +
net/socat/DETAILS | 2 -
net/socat/HISTORY | 8 +++-
net/socat/PRE_BUILD | 6 +++
net/socat/fix-linux-errqueue.h-not-found.patch | 41 ++++++++++++++++++++++
python-pypi/virtinst/DETAILS | 2 -
python-pypi/virtinst/HISTORY | 3 +
ruby-raa/facter/DETAILS | 7 ++-
ruby-raa/facter/HISTORY | 4 ++
ruby-raa/facter/PRE_BUILD | 3 -
ruby-raa/facter/facter-2.3.0.tar.gz.sig |binary
ruby-raa/facter/ftools.patch | 46
-------------------------
ruby-raa/hiera/BUILD | 1
ruby-raa/hiera/DEPENDS | 1
ruby-raa/hiera/DETAILS | 14 +++++++
ruby-raa/hiera/HISTORY | 3 +
ruby-raa/hiera/INSTALL | 1
ruby-raa/hiera/hiera-1.3.4.tar.gz.sig |binary
utils/augeas/DETAILS | 7 ++-
utils/augeas/HISTORY | 4 ++
utils/augeas/augeas-1.3.0.tar.gz.sig |binary
utils/libguestfs/DEPENDS | 1
utils/libguestfs/DETAILS | 2 -
utils/libguestfs/HISTORY | 4 ++
utils/puppet/3.7.3.tar.gz.sig |binary
utils/puppet/DEPENDS | 1
utils/puppet/DETAILS | 9 ++--
utils/puppet/HISTORY | 7 +++
utils/puppet/INSTALL | 2 -
utils/puppet/PRE_BUILD | 4 --
utils/puppet/ftools_gemtask.patch | 40 ---------------------
utils/supermin/DETAILS | 2 -
utils/supermin/HISTORY | 4 ++
utils/supermin/PRE_BUILD | 7 ---
xorg-lib/libxft/HISTORY | 3 +
xorg-lib/libxft/PRE_BUILD | 4 ++
xorg-lib/libxft/fix-freetype-includes.patch | 19 ++++++++++
38 files changed, 149 insertions(+), 118 deletions(-)

New commits:
commit bc697718b49c74246889abc5cd405a107ae198b4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

puppet: Updated to 3.7.3, depends on hiera

commit d1da70d604414edf649e6fe7e8d6b06dd4478734
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

hiera: Added

commit 9e2edb8a69c10147c3dcac6850a079ccf9af677e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

facter: Updated to 2.3.0

commit 7c5180efc82571671038f7c947530723ed26cf77
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libguestfs: Updated to 1.28.2

commit 63a6c5d593526f75eab2366b8fa60c9d47f6c173
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

augeas: Updated to 1.3.0

commit de16df1f304b56e1fa5853959b2fbb2dbe4000a0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

supermin: Updated to 5.1.11

commit 013b4f3052176ef743681e8d142c407b0c61ddd1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

socat: Cleanup whitespace

commit f052f9e1e060103e6afbadcdc3caae74ac19e730
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

socat: fix compilation with linux errqueue.h

commit 75a73ac1d11881e8b521ba79976808b08ab1a5c8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libxft: Fix to compile against freetype2 2.5.0+

commit e66603fad4d86c7a8d8b4eb4530d5f1016440bcb
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

virtinst: SOURCE_URL moved to https://fedorahosted.org/...

diff --git a/ChangeLog b/ChangeLog
index 2d0607a..55443e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
+ * ruby-raa/hiera: Added a key/value lookup tool for configuration data
+
2014-11-28 Vlad Glagolev <stealth AT sourcemage.org>
* libs/libspf2: new spell, fully thread safe SPF implementation

diff --git a/net/socat/DEPENDS b/net/socat/DEPENDS
index 19915d5..c4a699c 100755
--- a/net/socat/DEPENDS
+++ b/net/socat/DEPENDS
@@ -1,3 +1,5 @@
+depends autoconf &&
+
optional_depends SSL '--enable-openssl' \
'--disable-SSL' \
'encryption support' &&
diff --git a/net/socat/DETAILS b/net/socat/DETAILS
index 0688945..b8f8fd4 100755
--- a/net/socat/DETAILS
+++ b/net/socat/DETAILS
@@ -15,7 +15,7 @@ socat is a relay for bidirectional data transfer between
two independent data
channels. Each of these data channels may be a file, pipe, device (serial
line
etc. or a pseudo terminal), a socket (UNIX, IP4, IP6 - raw, UDP, TCP), an
SSL socket, proxy CONNECT connection, a file descriptor (stdin etc.), the GNU
-line editor, a program, or a combination of two of these.
+line editor, a program, or a combination of two of these.
These modes include generation of "listening" sockets, pipes and pseudo
terminals.
EOF
diff --git a/net/socat/HISTORY b/net/socat/HISTORY
index a6ed395..cbb959e 100644
--- a/net/socat/HISTORY
+++ b/net/socat/HISTORY
@@ -1,5 +1,9 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Add autoconf for `autoconf` in PRE_BUILD
+ * PRE_BUILD, fix-linux-errqueue.h-not-found.patch: Added to fix
compilation
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL

2014-03-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.2.4
diff --git a/net/socat/PRE_BUILD b/net/socat/PRE_BUILD
new file mode 100755
index 0000000..694359e
--- /dev/null
+++ b/net/socat/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Fixing linux errqueue.h not
found...${DEFAULT_COLOR}" &&
+patch -p1 "${SOURCE_DIRECTORY}"/configure.in \
+ "${SPELL_DIRECTORY}"/fix-linux-errqueue.h-not-found.patch &&
+cd "${SOURCE_DIRECTORY}" &&
+autoconf
diff --git a/net/socat/fix-linux-errqueue.h-not-found.patch
b/net/socat/fix-linux-errqueue.h-not-found.patch
new file mode 100644
index 0000000..b5b5cdb
--- /dev/null
+++ b/net/socat/fix-linux-errqueue.h-not-found.patch
@@ -0,0 +1,41 @@
+# From http://patchwork.openembedded.org/patch/72771/
+configure.in: fix linux/errqueue.h not found
+
+The do_compile failed:
+...
+|tmp/work/core2-64-poky-linux/socat/1.7.2.4-r0/socat-1.7.2.4/xio-ip.c:
+In function 'xiolog_ancillary_ip':
+|tmp/work/core2-64-poky-linux/socat/1.7.2.4-r0/socat-1.7.2.4/xio-ip.c:520:12:
+error: dereferencing pointer to incomplete type
+| err->ee_errno, '\0', err->ee_origin, '\0', err->ee_type, '\0',
+| ^
+| ake: *** [xio-ip.o] Error 1
+...
+
+For 1.7.2.4, the header check of 'linux/errqueue.h ' was not correctly,
+but the old version 1.7.2.3 worked, so we reference 1.7.2.3 to fix this
+issue.
+
+Upstream-Status: Pending
+Signed-off-by: Hongxu Jia <hongxu.jia AT windriver.com>
+---
+ configure.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 70922f9..bdfbe98 100644
+--- a/configure.in
++++ b/configure.in
+@@ -79,8 +79,7 @@ AC_HEADER_RESOLV()
+
+ AC_CHECK_HEADERS(termios.h linux/if_tun.h)
+ AC_CHECK_HEADERS(net/if_dl.h)
+-AC_CHECK_HEADERS(linux/types.h)
+-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [],
[#include <linux/types.h>])
++AC_CHECK_HEADERS(linux/types.h linux/errqueue.h)
+ AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
+ AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
+ AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
+--
+1.8.1.2
+
diff --git a/python-pypi/virtinst/DETAILS b/python-pypi/virtinst/DETAILS
index 15bceee..32a5c87 100755
--- a/python-pypi/virtinst/DETAILS
+++ b/python-pypi/virtinst/DETAILS
@@ -3,7 +3,7 @@
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://virt-manager.et.redhat.com/download/sources/$SPELL/$SOURCE
+ SOURCE_URL[0]=https://fedorahosted.org/released/python-virtinst/${SOURCE}
#
SOURCE_HASH=sha512:f45948f579480a562ac8e22fa35ab448fa9ab2418c8684950562b4fd8258eaae18e0a769a3235e64fa348ab3fc37f3276c18d0b002a2850fac1f7ee0491d1a82
LICENSE[0]=GPL
WEB_SITE=http://virt-manager.et.redhat.com/
diff --git a/python-pypi/virtinst/HISTORY b/python-pypi/virtinst/HISTORY
index d067243..8525439 100644
--- a/python-pypi/virtinst/HISTORY
+++ b/python-pypi/virtinst/HISTORY
@@ -1,3 +1,6 @@
+2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: SOURCE_URL moved to https://fedorahosted.org/...
+
2013-08-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.600.4

diff --git a/ruby-raa/facter/DETAILS b/ruby-raa/facter/DETAILS
index 0bb1502..20c8fc6 100755
--- a/ruby-raa/facter/DETAILS
+++ b/ruby-raa/facter/DETAILS
@@ -1,8 +1,9 @@
SPELL=facter
- VERSION=1.5.7
+ VERSION=2.3.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://puppetlabs.com/downloads/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:722afd5b75e206e9a2d16c371edeb71810ace1b4e713e7a22945ab1c2ad90299b1dd211003d48452930b8897359e3214d0ccb84dac7c7a9efbc035564f48c8fa
+ SOURCE_URL[0]=http://downloads.puppetlabs.com/${SPELL}/${SOURCE}
+#
SOURCE_HASH=sha512:722afd5b75e206e9a2d16c371edeb71810ace1b4e713e7a22945ab1c2ad90299b1dd211003d48452930b8897359e3214d0ccb84dac7c7a9efbc035564f48c8fa
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.puppetlabs.com/puppet/related-projects/facter/";
LICENSE[0]=GPL
diff --git a/ruby-raa/facter/HISTORY b/ruby-raa/facter/HISTORY
index e46382f..1d33f02 100644
--- a/ruby-raa/facter/HISTORY
+++ b/ruby-raa/facter/HISTORY
@@ -1,3 +1,7 @@
+2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.3.0
+ * PRE_BUILD, ftools.patch: Removed
+
2010-06-17 Mark Bainter <mbainter AT sourcemage.org>
* PRE_BUILD, BUILD, DEPENDS, DETAILS, INSTALL: spell created
* ftools.patch: enable building against Ruby 1.9.1
diff --git a/ruby-raa/facter/PRE_BUILD b/ruby-raa/facter/PRE_BUILD
deleted file mode 100755
index 39cc0ed..0000000
--- a/ruby-raa/facter/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/ftools.patch
diff --git a/ruby-raa/facter/facter-2.3.0.tar.gz.sig
b/ruby-raa/facter/facter-2.3.0.tar.gz.sig
new file mode 100644
index 0000000..60351f2
Binary files /dev/null and b/ruby-raa/facter/facter-2.3.0.tar.gz.sig differ
diff --git a/ruby-raa/facter/ftools.patch b/ruby-raa/facter/ftools.patch
deleted file mode 100644
index e5860e8..0000000
--- a/ruby-raa/facter/ftools.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit 5412eab12df89a7a701ffea4f5dfb98d0f56985e
-Author: Stéphan Gorget <phantez AT gmail.com>
-Date: Thu Nov 5 00:51:34 2009 +0100
-
- Fixed : 2788 - ftools missing in Ruby 1.9
-
- Signed-off-by: Stéphan Gorget <phantez AT gmail.com>
-
-diff --git a/install.rb b/install.rb
-index ec16c4b..1280f04 100755
---- a/install.rb
-+++ b/install.rb
-@@ -35,7 +35,13 @@
- require 'rbconfig'
- require 'find'
- require 'fileutils'
--require 'ftools' # apparently on some system ftools doesn't get loaded
-+begin
-+ require 'ftools' # apparently on some system ftools doesn't get loaded
-+ $haveftools = true
-+rescue LoadError
-+ puts "ftools not found. Using FileUtils instead.."
-+ $haveftools = false
-+end
- require 'optparse'
- require 'ostruct'
-
-@@ -91,9 +97,15 @@ def do_libs(libs, strip = 'lib/')
- libs.each do |lf|
- olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, ''))
- op = File.dirname(olf)
-- File.makedirs(op, true)
-- File.chmod(0755, op)
-- File.install(lf, olf, 0644, true)
-+ if $haveftools
-+ File.makedirs(op, true)
-+ File.chmod(0755, op)
-+ File.install(lf, olf, 0644, true)
-+ else
-+ FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
-+ FileUtils.chmod(0755, op)
-+ FileUtils.install(lf, olf, {:mode => 0644, :verbose => true})
-+ end
- end
- end
-
diff --git a/ruby-raa/hiera/BUILD b/ruby-raa/hiera/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/ruby-raa/hiera/BUILD
@@ -0,0 +1 @@
+true
diff --git a/ruby-raa/hiera/DEPENDS b/ruby-raa/hiera/DEPENDS
new file mode 100755
index 0000000..257635e
--- /dev/null
+++ b/ruby-raa/hiera/DEPENDS
@@ -0,0 +1 @@
+depends RUBY
diff --git a/ruby-raa/hiera/DETAILS b/ruby-raa/hiera/DETAILS
new file mode 100755
index 0000000..43b7ca4
--- /dev/null
+++ b/ruby-raa/hiera/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=hiera
+ VERSION=1.3.4
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://downloads.puppetlabs.com/${SPELL}/${SOURCE}
+#
SOURCE_HASH=sha512:722afd5b75e206e9a2d16c371edeb71810ace1b4e713e7a22945ab1c2ad90299b1dd211003d48452930b8897359e3214d0ccb84dac7c7a9efbc035564f48c8fa
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://docs.puppetlabs.com/hiera/1/index.html";
+ LICENSE[0]=GPL
+ ENTERED=20141204
+ SHORT="Hiera is a key/value lookup tool for configuration data"
+cat << EOF
+Hiera is a key/value lookup tool for configuration data, built to make
Puppet better and let you set node-specific data without repeating yourself.
+EOF
diff --git a/ruby-raa/hiera/HISTORY b/ruby-raa/hiera/HISTORY
new file mode 100644
index 0000000..39ad2e8
--- /dev/null
+++ b/ruby-raa/hiera/HISTORY
@@ -0,0 +1,3 @@
+2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD, BUILD, DEPENDS, DETAILS, INSTALL: Created
+
diff --git a/ruby-raa/hiera/INSTALL b/ruby-raa/hiera/INSTALL
new file mode 100755
index 0000000..87396fe
--- /dev/null
+++ b/ruby-raa/hiera/INSTALL
@@ -0,0 +1 @@
+cd $SOURCE_DIRECTORY && ls && ruby ./install.rb
diff --git a/ruby-raa/hiera/hiera-1.3.4.tar.gz.sig
b/ruby-raa/hiera/hiera-1.3.4.tar.gz.sig
new file mode 100644
index 0000000..94a7fd6
Binary files /dev/null and b/ruby-raa/hiera/hiera-1.3.4.tar.gz.sig differ
diff --git a/utils/augeas/DETAILS b/utils/augeas/DETAILS
index 0eeb99f..71920c1 100755
--- a/utils/augeas/DETAILS
+++ b/utils/augeas/DETAILS
@@ -1,8 +1,9 @@
SPELL=augeas
- VERSION=0.7.3
+ VERSION=1.3.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://${SPELL}.net/download/${SOURCE}
-
SOURCE_HASH=sha512:9ccf00675f70f713a47bd743ee6c61ed4cf274129195d8b282f6521fabe7780a808f1a5302cac9d2b9efa2b51cf969478d1b267bc60d562d9469a4ec22d98eb6
+ SOURCE_URL[0]=http://download.augeas.net/${SOURCE}
+#
SOURCE_HASH=sha512:9ccf00675f70f713a47bd743ee6c61ed4cf274129195d8b282f6521fabe7780a808f1a5302cac9d2b9efa2b51cf969478d1b267bc60d562d9469a4ec22d98eb6
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://augeas.net/";
LICENSE[0]="LGPL"
diff --git a/utils/augeas/HISTORY b/utils/augeas/HISTORY
index 5395cf5..3ec4103 100644
--- a/utils/augeas/HISTORY
+++ b/utils/augeas/HISTORY
@@ -1,3 +1,7 @@
+2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.3.0
+ SOURCE_URL updated
+
2010-11-04 Robert Figura <template AT sourcemage.org>
* DETAILS: update to 0.7.3

diff --git a/utils/augeas/augeas-1.3.0.tar.gz.sig
b/utils/augeas/augeas-1.3.0.tar.gz.sig
new file mode 100644
index 0000000..0ebed4a
Binary files /dev/null and b/utils/augeas/augeas-1.3.0.tar.gz.sig differ
diff --git a/utils/libguestfs/DEPENDS b/utils/libguestfs/DEPENDS
index cf2dbf3..810be09 100755
--- a/utils/libguestfs/DEPENDS
+++ b/utils/libguestfs/DEPENDS
@@ -1,3 +1,4 @@
+depends augeas &&
depends genisoimage &&
depends supermin &&

diff --git a/utils/libguestfs/DETAILS b/utils/libguestfs/DETAILS
index c35e71f..787a4ba 100755
--- a/utils/libguestfs/DETAILS
+++ b/utils/libguestfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=libguestfs
- VERSION=1.22.6
+ VERSION=1.28.2
BRANCH="$(echo ${VERSION} | cut -d. -f1,2)"
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2="${SOURCE}.sig"
diff --git a/utils/libguestfs/HISTORY b/utils/libguestfs/HISTORY
index 3a2a070..4974a35 100644
--- a/utils/libguestfs/HISTORY
+++ b/utils/libguestfs/HISTORY
@@ -1,3 +1,7 @@
+2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.28.2
+ * DEPENDS: Depends on augeas
+
2013-09-17 Eric Sandall <sandalle AT sourcemage.org>
* Created

diff --git a/utils/puppet/3.7.3.tar.gz.sig b/utils/puppet/3.7.3.tar.gz.sig
new file mode 100644
index 0000000..d2d0d55
Binary files /dev/null and b/utils/puppet/3.7.3.tar.gz.sig differ
diff --git a/utils/puppet/DEPENDS b/utils/puppet/DEPENDS
index bdcb984..c26ffeb 100755
--- a/utils/puppet/DEPENDS
+++ b/utils/puppet/DEPENDS
@@ -1,4 +1,5 @@
depends facter &&
+depends hiera &&
depends RUBY &&
suggest_depends shadow "" "" "for shadow file support" &&
suggest_depends augeas "" "" "for automated editing of configuration files"
&&
diff --git a/utils/puppet/DETAILS b/utils/puppet/DETAILS
index 724ea09..a74f600 100755
--- a/utils/puppet/DETAILS
+++ b/utils/puppet/DETAILS
@@ -1,8 +1,9 @@
SPELL=puppet
- VERSION=0.25.5
- SOURCE="puppet-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://puppetlabs.com/downloads/puppet/${SOURCE}
-
SOURCE_HASH=sha512:a563421f57e30eb09dc0596f4769ccaa45e9f9c6f29aa4072f370cc95cb50aab00b9ec3450289ea20b7383bb184c491a2ddbe003845beb7d01d328083f3dbad7
+ VERSION=3.7.3
+ SOURCE="${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://github.com/puppetlabs/${SPELL}/archive/${SOURCE}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+#
SOURCE_HASH=sha512:a563421f57e30eb09dc0596f4769ccaa45e9f9c6f29aa4072f370cc95cb50aab00b9ec3450289ea20b7383bb184c491a2ddbe003845beb7d01d328083f3dbad7
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/puppet-${VERSION}"
WEB_SITE="http://puppetlabs.com/";
LICENSE[0]=GPL
diff --git a/utils/puppet/HISTORY b/utils/puppet/HISTORY
index a3c22b1..54d1290 100644
--- a/utils/puppet/HISTORY
+++ b/utils/puppet/HISTORY
@@ -1,3 +1,10 @@
+2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 3.7.3
+ SOURCE_URL updated
+ * DEPENDS: Depends on hiera
+ * PRE_BUILD, ftools_gemtask.patch: Removed
+ * INSTALL: No more namespaceauth.conf to copy
+
2010-06-17 Mark Bainter <mbainter AT sourcemage.org>
* DEPENDS, DETAILS, CONFIGURE< PRE_BUILD, BUILD, INSTALL: spell
created
* puppet.conf, puppetmaster.conf: basic configuration files
diff --git a/utils/puppet/INSTALL b/utils/puppet/INSTALL
index ad9fd5b..f990181 100755
--- a/utils/puppet/INSTALL
+++ b/utils/puppet/INSTALL
@@ -18,8 +18,6 @@ fi &&
echo "**************** INSTALLING CONFIG FILES ********************" &&
install_config_file "${SOURCE_DIRECTORY}/conf/auth.conf" \
"${INSTALL_ROOT}/etc/puppet/auth.conf" &&
-install_config_file "${SOURCE_DIRECTORY}/conf/namespaceauth.conf" \
- "${INSTALL_ROOT}/etc/puppet/namespaceauth.conf" &&

if [[ "$CLIENT_ONLY" != 'y' ]]; then
echo "************* NOT CLIENT_ONLY (${CLIENT_ONLY}) - installing
manifests/modules ***************" &&
diff --git a/utils/puppet/PRE_BUILD b/utils/puppet/PRE_BUILD
deleted file mode 100755
index f571948..0000000
--- a/utils/puppet/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/ftools_gemtask.patch
-
diff --git a/utils/puppet/ftools_gemtask.patch
b/utils/puppet/ftools_gemtask.patch
deleted file mode 100644
index 2ebb9c8..0000000
--- a/utils/puppet/ftools_gemtask.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- tasks/rake/gem-orig.rake 2010-05-16 23:10:24.000000000 -0500
-+++ tasks/rake/gem.rake 2010-06-18 05:28:29.000000000 -0500
-@@ -1,4 +1,10 @@
--require 'ftools'
-+begin
-+ require 'ftools'
-+ $haveftools = true
-+rescue LoadError
-+ puts "ftools not found. Using FileUtils instead.."
-+ $haveftools = false
-+end
-
- GEM_FILES = FileList[
- '[A-Z]*',
-@@ -44,7 +50,11 @@
- desc "Prepare binaries for gem creation"
- task :prepare_gem do
- SBIN.each do |f|
-- File.copy(f,"bin")
-+ if $haveftools
-+ FileUtils.copy(f,"bin")
-+ else
-+ File.copy(f,"bin")
-+ end
- end
- end
-
-@@ -52,7 +62,11 @@
- task :create_gem => :prepare_gem do
- Dir.mkdir("pkg") rescue nil
- Gem::Builder.new(spec).build
-- File.move("puppet-#{Puppet::PUPPETVERSION}.gem", "pkg")
-+ if $haveftools
-+ FileUtils.move("puppet-#{Puppet::PUPPETVERSION}.gem", "pkg")
-+ else
-+ File.move("puppet-#{Puppet::PUPPETVERSION}.gem", "pkg")
-+ end
- SBIN.each do |f|
- File.unlink("bin/" + f.gsub(/sbin\//, ''))
- end
diff --git a/utils/supermin/DETAILS b/utils/supermin/DETAILS
index 26fdd2a..a25a8e5 100755
--- a/utils/supermin/DETAILS
+++ b/utils/supermin/DETAILS
@@ -1,5 +1,5 @@
SPELL=supermin
- VERSION=4.1.5
+ VERSION=5.1.11
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2="${SOURCE}.sig"
SOURCE_GPG="redhat.gpg:${SOURCE2}:UPSTREAM_HASH"
diff --git a/utils/supermin/HISTORY b/utils/supermin/HISTORY
index 3a2a070..d4ccb2d 100644
--- a/utils/supermin/HISTORY
+++ b/utils/supermin/HISTORY
@@ -1,3 +1,7 @@
+2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 5.1.11
+ * PRE_BUILD: Removed, no longer needed
+
2013-09-17 Eric Sandall <sandalle AT sourcemage.org>
* Created

diff --git a/utils/supermin/PRE_BUILD b/utils/supermin/PRE_BUILD
deleted file mode 100755
index 1e86978..0000000
--- a/utils/supermin/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-
-message "${MESSAGE_COLOR}Update configure to current
automake...${DEFAULT_COLOR}" &&
-cd "${SOURCE_DIRECTORY}" &&
-touch NEWS AUTHORS ChangeLog &&
-aclocal -I m4 &&
-automake --add-missing
diff --git a/xorg-lib/libxft/HISTORY b/xorg-lib/libxft/HISTORY
index 1435268..306d49d 100644
--- a/xorg-lib/libxft/HISTORY
+++ b/xorg-lib/libxft/HISTORY
@@ -1,3 +1,6 @@
+2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD, fix-freetype-includes.patch: Added to compile against
freetype2 2.5.0+
+
2014-09-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: missing depends

diff --git a/xorg-lib/libxft/PRE_BUILD b/xorg-lib/libxft/PRE_BUILD
new file mode 100755
index 0000000..2fb1dad
--- /dev/null
+++ b/xorg-lib/libxft/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Fixing compilation against
${SPELL_COLOR}freetype2${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/src/xftglyphs.c \
+ "${SPELL_DIRECTORY}"/fix-freetype-includes.patch
diff --git a/xorg-lib/libxft/fix-freetype-includes.patch
b/xorg-lib/libxft/fix-freetype-includes.patch
new file mode 100644
index 0000000..d36c3a7
--- /dev/null
+++ b/xorg-lib/libxft/fix-freetype-includes.patch
@@ -0,0 +1,19 @@
+# Modified from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733385
+diff -Naur libXft-2.2.0.orig/src/xftglyphs.c libXft-2.2.0/src/xftglyphs.c
+--- libXft-2.2.0.orig/src/xftglyphs.c 2009-10-16 14:27:08.000000000 -0700
++++ libXft-2.2.0/src/xftglyphs.c 2014-12-04 15:03:54.485358680 -0800
+@@ -21,10 +21,12 @@
+ */
+
+ #include "xftint.h"
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
++#include FT_LCD_FILTER_H
+
+ #if HAVE_FT_GLYPHSLOT_EMBOLDEN
+-#include <freetype/ftsynth.h>
++#include FT_SYNTHESIS_H
+ #endif
+
+ static const int filters[3][3] = {



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (bc697718b49c74246889abc5cd405a107ae198b4), Eric Sandall, 12/04/2014

Archive powered by MHonArc 2.6.24.

Top of Page