[arch-commits] Commit in simgear/repos (6 files)

2017-02-27 Thread Sergej Pupykin 
Date: Monday, February 27, 2017 @ 15:01:15
  Author: spupykin
Revision: 214056

archrelease: copy trunk to community-i686, community-x86_64

Added:
  simgear/repos/community-i686/PKGBUILD
(from rev 214055, simgear/trunk/PKGBUILD)
  simgear/repos/community-x86_64/PKGBUILD
(from rev 214055, simgear/trunk/PKGBUILD)
Deleted:
  simgear/repos/community-i686/PKGBUILD
  simgear/repos/community-i686/sec-fix.patch
  simgear/repos/community-x86_64/PKGBUILD
  simgear/repos/community-x86_64/sec-fix.patch

+
 /PKGBUILD  |   58 +++
 community-i686/PKGBUILD|   37 
 community-i686/sec-fix.patch   |   17 ---
 community-x86_64/PKGBUILD  |   37 
 community-x86_64/sec-fix.patch |   17 ---
 5 files changed, 58 insertions(+), 108 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2017-02-27 15:00:56 UTC (rev 214055)
+++ community-i686/PKGBUILD 2017-02-27 15:01:15 UTC (rev 214056)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin 
-# Maintainer: William Rea 
-# Contributor: Hans Janssen 
-
-pkgname=simgear
-pkgver=2016.4.4
-_pkgver=${pkgver%.*}
-pkgrel=1
-pkgdesc="A set of open-source libraries designed to be used as building blocks 
for quickly assembling 3d simulations, games, and visualization applications."
-arch=(i686 x86_64)
-depends=('glu' 'glut' 'freealut' 'plib' 'openscenegraph')
-makedepends=('boost' 'cmake' 'mesa')
-license=("GPL")
-url="http://www.flightgear.org/;
-options=('!makeflags' 'staticlibs')
-#source=("git://git.code.sf.net/p/flightgear/simgear#commit=41f40a9a106520e92385d059b80c4ed3779eedcb")
-source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2;
-   sec-fix.patch)
-sha256sums=('5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc'
-'bfd4234d23beb5d2b229dbcd28fa436cfc822c50c0ab03aca51c7ca1194dbd16')
-
-prepare() {
-  cd "$srcdir"/simgear-$pkgver
-#  patch -p1 -i $srcdir/sec-fix.patch
-}
-
-build() {
-  cd "$srcdir"/simgear-$pkgver
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
-  make
-}
-
-package() {
-  cd "$srcdir"/simgear-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: simgear/repos/community-i686/PKGBUILD (from rev 214055, 
simgear/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-02-27 15:01:15 UTC (rev 214056)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Sergej Pupykin 
+# Maintainer: William Rea 
+# Contributor: Hans Janssen 
+
+pkgname=simgear
+pkgver=2017.1.1
+_pkgver=${pkgver%.*}
+pkgrel=1
+pkgdesc="A set of open-source libraries designed to be used as building blocks 
for quickly assembling 3d simulations, games, and visualization applications."
+arch=(i686 x86_64)
+depends=('glu' 'glut' 'freealut' 'plib' 'openscenegraph')
+makedepends=('boost' 'cmake' 'mesa')
+license=("GPL")
+url="http://www.flightgear.org/;
+options=('!makeflags' 'staticlibs')
+source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2;)
+sha256sums=('1815f6a2c3f43bb6121b2394e68f8e6e341c14a7a40e4163c0bcc105ee06ccbc')
+
+build() {
+  cd "$srcdir"/simgear-$pkgver
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
+  make
+}
+
+package() {
+  cd "$srcdir"/simgear-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-i686/sec-fix.patch
===
--- community-i686/sec-fix.patch2017-02-27 15:00:56 UTC (rev 214055)
+++ community-i686/sec-fix.patch2017-02-27 15:01:15 UTC (rev 214056)
@@ -1,17 +0,0 @@
 a/simgear/io/HTTPRepository.cxx
-+++ b/simgear/io/HTTPRepository.cxx
-@@ -503,6 +503,14 @@
- SG_LOG(SG_TERRASYNC, SG_WARN, "malformed .dirindex file: 
invalid type in line '" << line << "', expected 'd' or 'f', (ignoring line)" );
- continue;
- }
-+
-+// security: prevent writing outside the repository via ../../.. 
filenames
-+// (valid filenames never contain / - subdirectories have their 
own .dirindex)
-+if ((tokens[1] == "..") || (tokens[1].find_first_of("/\\") != 
std::string::npos)) {
-+SG_LOG(SG_TERRASYNC, SG_WARN, "malformed .dirindex file: 
invalid filename in line '" << line << "', (ignoring line)" );
-+continue;
-+}
-+
- children.push_back(ChildInfo(typeData == "f" ? 
ChildInfo::FileType : ChildInfo::DirectoryType, tokens[1], tokens[2]));
- 
- if (tokens.size() > 3) {

[arch-commits] Commit in simgear/repos (6 files)

2016-12-19 Thread Sergej Pupykin 
Date: Monday, December 19, 2016 @ 15:05:16
  Author: spupykin
Revision: 200315

archrelease: copy trunk to community-i686, community-x86_64

Added:
  simgear/repos/community-i686/PKGBUILD
(from rev 200314, simgear/trunk/PKGBUILD)
  simgear/repos/community-i686/sec-fix.patch
(from rev 200314, simgear/trunk/sec-fix.patch)
  simgear/repos/community-x86_64/PKGBUILD
(from rev 200314, simgear/trunk/PKGBUILD)
  simgear/repos/community-x86_64/sec-fix.patch
(from rev 200314, simgear/trunk/sec-fix.patch)
Deleted:
  simgear/repos/community-i686/PKGBUILD
  simgear/repos/community-x86_64/PKGBUILD

+
 /PKGBUILD  |   74 +++
 community-i686/PKGBUILD|   30 ---
 community-i686/sec-fix.patch   |   17 
 community-x86_64/PKGBUILD  |   30 ---
 community-x86_64/sec-fix.patch |   17 
 5 files changed, 108 insertions(+), 60 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2016-12-19 15:04:53 UTC (rev 200314)
+++ community-i686/PKGBUILD 2016-12-19 15:05:16 UTC (rev 200315)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin 
-# Maintainer: William Rea 
-# Contributor: Hans Janssen 
-
-pkgname=simgear
-pkgver=2016.4.3
-_pkgver=${pkgver%.*}
-pkgrel=1
-pkgdesc="A set of open-source libraries designed to be used as building blocks 
for quickly assembling 3d simulations, games, and visualization applications."
-arch=(i686 x86_64)
-depends=('glu' 'glut' 'freealut' 'plib' 'openscenegraph')
-makedepends=('boost' 'cmake' 'mesa')
-license=("GPL")
-url="http://www.flightgear.org/;
-options=('!makeflags' 'staticlibs')
-source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2;)
-#source=("git://git.code.sf.net/p/flightgear/simgear#commit=41f40a9a106520e92385d059b80c4ed3779eedcb")
-sha256sums=('6933550215818c2043b84df01b6bf5f7adef218c8648b510b8202e394003d2bd')
-
-build() {
-  cd "$srcdir"/simgear-$pkgver
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
-  make
-}
-
-package() {
-  cd "$srcdir"/simgear-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: simgear/repos/community-i686/PKGBUILD (from rev 200314, 
simgear/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-12-19 15:05:16 UTC (rev 200315)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Sergej Pupykin 
+# Maintainer: William Rea 
+# Contributor: Hans Janssen 
+
+pkgname=simgear
+pkgver=2016.4.3
+_pkgver=${pkgver%.*}
+pkgrel=2
+pkgdesc="A set of open-source libraries designed to be used as building blocks 
for quickly assembling 3d simulations, games, and visualization applications."
+arch=(i686 x86_64)
+depends=('glu' 'glut' 'freealut' 'plib' 'openscenegraph')
+makedepends=('boost' 'cmake' 'mesa')
+license=("GPL")
+url="http://www.flightgear.org/;
+options=('!makeflags' 'staticlibs')
+#source=("git://git.code.sf.net/p/flightgear/simgear#commit=41f40a9a106520e92385d059b80c4ed3779eedcb")
+source=("http://downloads.sourceforge.net/project/flightgear/release-${_pkgver}/${pkgname}-${pkgver}.tar.bz2;
+   sec-fix.patch)
+sha256sums=('6933550215818c2043b84df01b6bf5f7adef218c8648b510b8202e394003d2bd'
+'bfd4234d23beb5d2b229dbcd28fa436cfc822c50c0ab03aca51c7ca1194dbd16')
+
+prepare() {
+  cd "$srcdir"/simgear-$pkgver
+  patch -p1 -i $srcdir/sec-fix.patch
+}
+
+build() {
+  cd "$srcdir"/simgear-$pkgver
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
+  make
+}
+
+package() {
+  cd "$srcdir"/simgear-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Copied: simgear/repos/community-i686/sec-fix.patch (from rev 200314, 
simgear/trunk/sec-fix.patch)
===
--- community-i686/sec-fix.patch(rev 0)
+++ community-i686/sec-fix.patch2016-12-19 15:05:16 UTC (rev 200315)
@@ -0,0 +1,17 @@
+--- a/simgear/io/HTTPRepository.cxx
 b/simgear/io/HTTPRepository.cxx
+@@ -503,6 +503,14 @@
+ SG_LOG(SG_TERRASYNC, SG_WARN, "malformed .dirindex file: 
invalid type in line '" << line << "', expected 'd' or 'f', (ignoring line)" );
+ continue;
+ }
++
++// security: prevent writing outside the repository via ../../.. 
filenames
++// (valid filenames never contain / - subdirectories have their 
own .dirindex)
++if ((tokens[1] == "..") || (tokens[1].find_first_of("/\\") != 
std::string::npos)) {
++SG_LOG(SG_TERRASYNC, SG_WARN, "malformed .dirindex file: 
invalid filename in line '" << line << "', (ignoring

[arch-commits] Commit in simgear/repos (6 files)

2014-02-19 Thread Sergej Pupykin 
Date: Wednesday, February 19, 2014 @ 11:21:57
  Author: spupykin
Revision: 105919

archrelease: copy trunk to community-i686, community-x86_64

Added:
  simgear/repos/community-i686/PKGBUILD
(from rev 105918, simgear/trunk/PKGBUILD)
  simgear/repos/community-x86_64/PKGBUILD
(from rev 105918, simgear/trunk/PKGBUILD)
Deleted:
  simgear/repos/community-i686/PKGBUILD
  simgear/repos/community-i686/osg-3.2.patch
  simgear/repos/community-x86_64/PKGBUILD
  simgear/repos/community-x86_64/osg-3.2.patch

+
 /PKGBUILD  |   60 +++
 community-i686/PKGBUILD|   30 ---
 community-i686/osg-3.2.patch   |   22 --
 community-x86_64/PKGBUILD  |   30 ---
 community-x86_64/osg-3.2.patch |   22 --
 5 files changed, 60 insertions(+), 104 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2014-02-19 10:21:43 UTC (rev 105918)
+++ community-i686/PKGBUILD 2014-02-19 10:21:57 UTC (rev 105919)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
-# Maintainer: William Rea sillywi...@gmail.com
-# Contributor: Hans Janssen h...@janserv.xs4all.nl
-
-pkgname=simgear
-pkgver=2.12.1
-pkgrel=2
-pkgdesc=A set of open-source libraries designed to be used as building blocks 
for quickly assembling 3d simulations, games, and visualization applications.
-arch=(i686 x86_64)
-depends=('glut' 'freealut' 'plib' 'openscenegraph')
-makedepends=('boost' 'cmake' 'mesa')
-license=(GPL)
-#url=http://www.simgear.org;
-url=https://gitorious.org/fg;
-options=('!makeflags' 'staticlibs')
-#source=(SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver;)
-source=(http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2;)
-md5sums=('8c483e13bce96f1dc27300a087fdb962')
-
-build() {
-  cd $srcdir/simgear-$pkgver
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
-  make
-}
-
-package() {
-  cd $srcdir/simgear-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: simgear/repos/community-i686/PKGBUILD (from rev 105918, 
simgear/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-02-19 10:21:57 UTC (rev 105919)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
+# Maintainer: William Rea sillywi...@gmail.com
+# Contributor: Hans Janssen h...@janserv.xs4all.nl
+
+pkgname=simgear
+pkgver=3.0.0
+pkgrel=1
+pkgdesc=A set of open-source libraries designed to be used as building blocks 
for quickly assembling 3d simulations, games, and visualization applications.
+arch=(i686 x86_64)
+depends=('glu' 'glut' 'freealut' 'plib' 'openscenegraph')
+makedepends=('boost' 'cmake' 'mesa')
+license=(GPL)
+#url=http://www.simgear.org;
+url=https://gitorious.org/fg;
+options=('!makeflags' 'staticlibs')
+#source=(SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver;)
+source=(http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2;)
+md5sums=('097f55962dfc48b3e740334dbfda64a6')
+
+build() {
+  cd $srcdir/simgear-$pkgver
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
+  make
+}
+
+package() {
+  cd $srcdir/simgear-$pkgver
+  make DESTDIR=$pkgdir install
+}

Deleted: community-i686/osg-3.2.patch
===
--- community-i686/osg-3.2.patch2014-02-19 10:21:43 UTC (rev 105918)
+++ community-i686/osg-3.2.patch2014-02-19 10:21:57 UTC (rev 105919)
@@ -1,22 +0,0 @@
-diff -wbBur simgear-2.10.0/simgear/scene/material/EffectGeode.cxx 
simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx
 simgear-2.10.0/simgear/scene/material/EffectGeode.cxx  2011-06-29 
18:58:56.0 +0400
-+++ simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx2013-07-25 
16:14:24.268934729 +0400
-@@ -80,15 +80,15 @@
- int n = _effect-getGenerator(Effect::TANGENT);
- tsg-generate(geometry, 0);  // 0 is normal_unit, but I have no idea 
what that is!
- if (n != -1  !geometry-getVertexAttribArray(n))
--geometry-setVertexAttribData(n, 
osg::Geometry::ArrayData(tsg-getTangentArray(), 
osg::Geometry::BIND_PER_VERTEX,GL_FALSE));
-+geometry-setVertexAttribArray(n, tsg-getTangentArray(), 
osg::Array::BIND_PER_VERTEX);
- 
- n = _effect-getGenerator(Effect::BINORMAL);
- if (n != -1  !geometry-getVertexAttribArray(n))
--geometry-setVertexAttribData(n, 
osg::Geometry::ArrayData(tsg-getBinormalArray(), 
osg::Geometry::BIND_PER_VERTEX,GL_FALSE));
-+geometry-setVertexAttribArray(n, tsg-getBinormalArray(), 
osg::Array::BIND_PER_VERTEX);
- 
- n =

[arch-commits] Commit in simgear/repos (6 files)

2013-07-25 Thread Sergej Pupykin 
Date: Thursday, July 25, 2013 @ 14:34:11
  Author: spupykin
Revision: 94470

archrelease: copy trunk to community-i686, community-x86_64

Added:
  simgear/repos/community-i686/PKGBUILD
(from rev 94469, simgear/trunk/PKGBUILD)
  simgear/repos/community-i686/osg-3.2.patch
(from rev 94469, simgear/trunk/osg-3.2.patch)
  simgear/repos/community-x86_64/PKGBUILD
(from rev 94469, simgear/trunk/PKGBUILD)
  simgear/repos/community-x86_64/osg-3.2.patch
(from rev 94469, simgear/trunk/osg-3.2.patch)
Deleted:
  simgear/repos/community-i686/PKGBUILD
  simgear/repos/community-x86_64/PKGBUILD

+
 /PKGBUILD  |   74 +++
 community-i686/PKGBUILD|   30 ---
 community-i686/osg-3.2.patch   |   22 +++
 community-x86_64/PKGBUILD  |   30 ---
 community-x86_64/osg-3.2.patch |   22 +++
 5 files changed, 118 insertions(+), 60 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-07-25 12:33:44 UTC (rev 94469)
+++ community-i686/PKGBUILD 2013-07-25 12:34:11 UTC (rev 94470)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
-# Maintainer: William Rea sillywi...@gmail.com
-# Contributor: Hans Janssen h...@janserv.xs4all.nl
-
-pkgname=simgear
-pkgver=2.10.0
-pkgrel=1
-pkgdesc=A set of open-source libraries designed to be used as building blocks 
for quickly assembling 3d simulations, games, and visualization applications.
-arch=(i686 x86_64)
-depends=('glut' 'freealut' 'plib' 'openscenegraph')
-makedepends=('boost' 'cmake' 'mesa')
-license=(GPL)
-#url=http://www.simgear.org;
-url=https://gitorious.org/fg;
-options=('!makeflags')
-#source=(SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver;)
-source=(http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2;)
-md5sums=('0ec974d3778f777d5c99c89db671fcc7')
-
-build() {
-  cd $srcdir/simgear-$pkgver
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
-  make
-}
-
-package() {
-  cd $srcdir/simgear-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: simgear/repos/community-i686/PKGBUILD (from rev 94469, 
simgear/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-07-25 12:34:11 UTC (rev 94470)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Sergej Pupykin pupykin.s+a...@gmail.com
+# Maintainer: William Rea sillywi...@gmail.com
+# Contributor: Hans Janssen h...@janserv.xs4all.nl
+
+pkgname=simgear
+pkgver=2.10.0
+pkgrel=2
+pkgdesc=A set of open-source libraries designed to be used as building blocks 
for quickly assembling 3d simulations, games, and visualization applications.
+arch=(i686 x86_64)
+depends=('glut' 'freealut' 'plib' 'openscenegraph')
+makedepends=('boost' 'cmake' 'mesa')
+license=(GPL)
+#url=http://www.simgear.org;
+url=https://gitorious.org/fg;
+options=('!makeflags')
+#source=(SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver;)
+source=(http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2;
+   osg-3.2.patch)
+md5sums=('0ec974d3778f777d5c99c89db671fcc7'
+ 'd7f35f02d88c6ef9c58e07b8431811e6')
+
+prepare() {
+  cd $srcdir/simgear-$pkgver
+  patch -p1 $srcdir/osg-3.2.patch
+}
+
+build() {
+  cd $srcdir/simgear-$pkgver
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
+  make
+}
+
+package() {
+  cd $srcdir/simgear-$pkgver
+  make DESTDIR=$pkgdir install
+}

Copied: simgear/repos/community-i686/osg-3.2.patch (from rev 94469, 
simgear/trunk/osg-3.2.patch)
===
--- community-i686/osg-3.2.patch(rev 0)
+++ community-i686/osg-3.2.patch2013-07-25 12:34:11 UTC (rev 94470)
@@ -0,0 +1,22 @@
+diff -wbBur simgear-2.10.0/simgear/scene/material/EffectGeode.cxx 
simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx
+--- simgear-2.10.0/simgear/scene/material/EffectGeode.cxx  2011-06-29 
18:58:56.0 +0400
 simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx2013-07-25 
16:14:24.268934729 +0400
+@@ -80,15 +80,15 @@
+ int n = _effect-getGenerator(Effect::TANGENT);
+ tsg-generate(geometry, 0);  // 0 is normal_unit, but I have no idea 
what that is!
+ if (n != -1  !geometry-getVertexAttribArray(n))
+-geometry-setVertexAttribData(n, 
osg::Geometry::ArrayData(tsg-getTangentArray(), 
osg::Geometry::BIND_PER_VERTEX,GL_FALSE));
++geometry-setVertexAttribArray(n, tsg-getTangentArray(), 
osg::Array::BIND_PER_VERTEX);
+ 
+ n = _effect-getGenerator(Effect::BINORMAL);
+ if (n != -1  !geometry-getVertexAttribArray(n))
+-