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

Sergej Pupykin spupykin at archlinux.org
Mon Feb 27 15:01:16 UTC 2017


    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 <pupykin.s+arch at gmail.com>
-# Maintainer: William Rea <sillywilly at gmail.com>
-# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
-
-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 <pupykin.s+arch at gmail.com>
+# Maintainer: William Rea <sillywilly at gmail.com>
+# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
+
+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.patch	2017-02-27 15:00:56 UTC (rev 214055)
+++ community-i686/sec-fix.patch	2017-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) {

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-02-27 15:00:56 UTC (rev 214055)
+++ community-x86_64/PKGBUILD	2017-02-27 15:01:15 UTC (rev 214056)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: William Rea <sillywilly at gmail.com>
-# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
-
-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-x86_64/PKGBUILD (from rev 214055, simgear/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-02-27 15:01:15 UTC (rev 214056)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: William Rea <sillywilly at gmail.com>
+# Contributor: Hans Janssen <hans at janserv.xs4all.nl>
+
+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-x86_64/sec-fix.patch
===================================================================
--- community-x86_64/sec-fix.patch	2017-02-27 15:00:56 UTC (rev 214055)
+++ community-x86_64/sec-fix.patch	2017-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) {



More information about the arch-commits mailing list