[csw-devel] SF.net SVN: gar:[18603] csw/mgar/pkg
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Fri Jun 29 14:55:41 CEST 2012
Revision: 18603
http://gar.svn.sourceforge.net/gar/?rev=18603&view=rev
Author: pfelecan
Date: 2012-06-29 12:55:41 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
par2cmdline/trunk: migrated from a private recipe to a GAR based recipe
Added Paths:
-----------
csw/mgar/pkg/par2cmdline/
csw/mgar/pkg/par2cmdline/Makefile
csw/mgar/pkg/par2cmdline/branches/
csw/mgar/pkg/par2cmdline/tags/
csw/mgar/pkg/par2cmdline/trunk/
csw/mgar/pkg/par2cmdline/trunk/Makefile
csw/mgar/pkg/par2cmdline/trunk/checksums
csw/mgar/pkg/par2cmdline/trunk/files/
csw/mgar/pkg/par2cmdline/trunk/files/0001-Debian-0.4-11-serial-000_unidentified.patch
csw/mgar/pkg/par2cmdline/trunk/files/0002-Debian-0.4-11-serial-001_hardlinks.patch
csw/mgar/pkg/par2cmdline/trunk/files/0003-Debian-0.4-11-serial-002_gcc_40_fixes.patch
csw/mgar/pkg/par2cmdline/trunk/files/0004-Debian-0.4-11-serial-003_fix_crash_in_quiet_mode.patch
csw/mgar/pkg/par2cmdline/trunk/files/0005-Fix-media-size-ioctl.patch
csw/mgar/pkg/par2cmdline/trunk/files/0006-Fix-pretest-script.patch
Added: csw/mgar/pkg/par2cmdline/Makefile
===================================================================
--- csw/mgar/pkg/par2cmdline/Makefile (rev 0)
+++ csw/mgar/pkg/par2cmdline/Makefile 2012-06-29 12:55:41 UTC (rev 18603)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Property changes on: csw/mgar/pkg/par2cmdline/trunk
___________________________________________________________________
Added: svn:ignore
+ work
Added: csw/mgar/pkg/par2cmdline/trunk/Makefile
===================================================================
--- csw/mgar/pkg/par2cmdline/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/par2cmdline/trunk/Makefile 2012-06-29 12:55:41 UTC (rev 18603)
@@ -0,0 +1,40 @@
+# $Id$
+
+NAME = par2cmdline
+VERSION = 0.4
+GARTYPE = v2
+CATEGORIES = apps
+
+DESCRIPTION = Program for creating and using PAR2 files to detect damage in data files and repair them if necessary
+define BLURB
+ Program for creating and using PAR2 files to detect damage in data
+ files and repair them if necessary
+endef
+
+MASTER_SITES = $(SF_MIRRORS)
+SF_PROJ = parchive
+DISTFILES = $(DISTNAME).tar.gz
+PATCHFILES = 0001-Debian-0.4-11-serial-000_unidentified.patch
+PATCHFILES += 0002-Debian-0.4-11-serial-001_hardlinks.patch
+PATCHFILES += 0003-Debian-0.4-11-serial-002_gcc_40_fixes.patch
+PATCHFILES += 0004-Debian-0.4-11-serial-003_fix_crash_in_quiet_mode.patch
+PATCHFILES += 0005-Fix-media-size-ioctl.patch
+PATCHFILES += 0006-Fix-pretest-script.patch
+
+GARCOMPILER = GNU
+CONFIGURE_ARGS = $(DIRPATHS)
+
+RUNTIME_DEP_PKGS += CSWlibgcc-s1
+RUNTIME_DEP_PKGS += CSWlibstdc++6
+
+include gar/category.mk
+
+post-install-modulated: pkgdocdir = $(docdir)/$(NAME)
+post-install-modulated:
+ ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(pkgdocdir)
+ ginstall --preserve-timestamps --mode=u=rw,go=r $(WORKSRC)/README $(DESTDIR)$(pkgdocdir)
+ $(MAKECOOKIE)
+
+# this is private and not available publicly
+mydependencies:
+ $(HOME)/bin/ocswdeplist --package $(NAME)
Property changes on: csw/mgar/pkg/par2cmdline/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/par2cmdline/trunk/checksums
===================================================================
--- csw/mgar/pkg/par2cmdline/trunk/checksums (rev 0)
+++ csw/mgar/pkg/par2cmdline/trunk/checksums 2012-06-29 12:55:41 UTC (rev 18603)
@@ -0,0 +1 @@
+1551b63e57e3c232254dc62073b723a9 par2cmdline-0.4.tar.gz
Added: csw/mgar/pkg/par2cmdline/trunk/files/0001-Debian-0.4-11-serial-000_unidentified.patch
===================================================================
--- csw/mgar/pkg/par2cmdline/trunk/files/0001-Debian-0.4-11-serial-000_unidentified.patch (rev 0)
+++ csw/mgar/pkg/par2cmdline/trunk/files/0001-Debian-0.4-11-serial-000_unidentified.patch 2012-06-29 12:55:41 UTC (rev 18603)
@@ -0,0 +1,305 @@
+From 56d71aa95571da606492a94fcb5ff933007bab3d Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 29 Jun 2012 11:44:25 +0200
+Subject: [PATCH] Debian 0.4-11 serial 000_unidentified
+
+---
+ diskfile.cpp | 27 +++++++++++----
+ letype.h | 101 ++-------------------------------------------------------
+ md5.h | 38 +++++++++-------------
+ par2cmdline.h | 6 ++++
+ 4 files changed, 45 insertions(+), 127 deletions(-)
+
+diff --git a/diskfile.cpp b/diskfile.cpp
+index 6ed4ba7..8eaf710 100644
+--- a/diskfile.cpp
++++ b/diskfile.cpp
+@@ -799,20 +799,33 @@ void DiskFile::SplitFilename(string filename, string &path, string &name)
+ bool DiskFile::FileExists(string filename)
+ {
+ struct stat st;
+- return ((0 == stat(filename.c_str(), &st)) && (0 != (st.st_mode & S_IFREG)));
++ return ((0 == stat(filename.c_str(), &st)) &&
++ (st.st_mode & (S_IFREG|S_IFBLK)) );
+ }
+
+ u64 DiskFile::GetFileSize(string filename)
+ {
+ struct stat st;
+- if ((0 == stat(filename.c_str(), &st)) && (0 != (st.st_mode & S_IFREG)))
++ if (0 == stat(filename.c_str(), &st))
+ {
+- return st.st_size;
+- }
+- else
+- {
+- return 0;
++ if (st.st_mode & S_IFREG)
++ {
++ return st.st_size;
++ }
++ else if (st.st_mode & S_IFBLK)
++ {
++ FILE *fp;
++ u64 size = 0;
++ if ( NULL != (fp = fopen(filename.c_str(), "rb")) )
++ {
++ ioctl(fileno(fp), BLKGETSIZE64, &size);
++ fclose(fp);
++ }
++ return size;
++ }
+ }
++
++ return 0;
+ }
+
+
+diff --git a/letype.h b/letype.h
+index 68b56d4..d1f6bdd 100644
+--- a/letype.h
++++ b/letype.h
+@@ -28,44 +28,15 @@ typedef u64 leu64;
+
+ #else
+
+-class leu16
++struct leu16
+ {
+-public:
+- leu16(void);
+-
+- leu16(const leu16 &other);
+- leu16& operator=(const leu16 &other);
+-
+- leu16(const u16 &other);
+ leu16& operator=(const u16 &other);
+
+ operator u16(void) const;
+
+-protected:
+ u16 value;
+ };
+
+-inline leu16::leu16(void)
+-{
+-}
+-
+-inline leu16::leu16(const leu16 &other)
+-: value(other.value)
+-{
+-}
+-
+-inline leu16& leu16::operator =(const leu16 &other)
+-{
+- value = other.value;
+- return *this;
+-}
+-
+-inline leu16::leu16(const u16 &other)
+-{
+- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
+- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
+-}
+-
+ inline leu16& leu16::operator=(const u16 &other)
+ {
+ ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
+@@ -81,46 +52,15 @@ inline leu16::operator u16(void) const
+ }
+
+
+-class leu32
++struct leu32
+ {
+-public:
+- leu32(void);
+-
+- leu32(const leu32 &other);
+- leu32& operator=(const leu32 &other);
+-
+- leu32(const u32 &other);
+ leu32& operator=(const u32 &other);
+
+ operator u32(void) const;
+
+-protected:
+ u32 value;
+ };
+
+-inline leu32::leu32(void)
+-{
+-}
+-
+-inline leu32::leu32(const leu32 &other)
+-: value(other.value)
+-{
+-}
+-
+-inline leu32& leu32::operator =(const leu32 &other)
+-{
+- value = other.value;
+- return *this;
+-}
+-
+-inline leu32::leu32(const u32 &other)
+-{
+- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
+- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
+- ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff);
+- ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff);
+-}
+-
+ inline leu32& leu32::operator=(const u32 &other)
+ {
+ ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
+@@ -140,50 +80,15 @@ inline leu32::operator u32(void) const
+ }
+
+
+-class leu64
++struct leu64
+ {
+-public:
+- leu64(void);
+-
+- leu64(const leu64 &other);
+- leu64& operator=(const leu64 &other);
+-
+- leu64(const u64 &other);
+ leu64& operator=(const u64 &other);
+
+ operator u64(void) const;
+
+-protected:
+ u64 value;
+ };
+
+-inline leu64::leu64(void)
+-{
+-}
+-
+-inline leu64::leu64(const leu64 &other)
+-: value(other.value)
+-{
+-}
+-
+-inline leu64& leu64::operator =(const leu64 &other)
+-{
+- value = other.value;
+- return *this;
+-}
+-
+-inline leu64::leu64(const u64 &other)
+-{
+- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
+- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff);
+- ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff);
+- ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff);
+- ((unsigned char*)&value)[4] = (unsigned char)((other >> 32) & 0xff);
+- ((unsigned char*)&value)[5] = (unsigned char)((other >> 40) & 0xff);
+- ((unsigned char*)&value)[6] = (unsigned char)((other >> 48) & 0xff);
+- ((unsigned char*)&value)[7] = (unsigned char)((other >> 56) & 0xff);
+-}
+-
+ inline leu64& leu64::operator=(const u64 &other)
+ {
+ ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff);
+diff --git a/md5.h b/md5.h
+index ade2223..b87d9f1 100644
+--- a/md5.h
++++ b/md5.h
+@@ -20,6 +20,13 @@
+ #ifndef __MD5_H__
+ #define __MD5_H__
+
++#ifdef WIN32
++#pragma pack(push, 1)
++#define PACKED
++#else
++#define PACKED __attribute__ ((packed))
++#endif
++
+ // This file defines the MD5Hash and MD5Context objects which are used
+ // to compute and manipulate the MD5 Hash values for a block of data.
+
+@@ -35,12 +42,11 @@
+
+ // MD5 Hash value
+
+-class MD5Hash
+-{
+-public:
+- // Constructor does not initialise the value
+- MD5Hash(void) {};
++struct MD5Hash;
++ostream& operator<<(ostream &s, const MD5Hash &hash);
+
++struct MD5Hash
++{
+ // Comparison operators
+ bool operator==(const MD5Hash &other) const;
+ bool operator!=(const MD5Hash &other) const;
+@@ -54,13 +60,8 @@ public:
+ friend ostream& operator<<(ostream &s, const MD5Hash &hash);
+ string print(void) const;
+
+- // Copy and assignment
+- MD5Hash(const MD5Hash &other);
+- MD5Hash& operator=(const MD5Hash &other);
+-
+-public:
+ u8 hash[16]; // 16 byte MD5 Hash value
+-};
++} PACKED;
+
+ // Intermediate computation state
+
+@@ -144,16 +145,9 @@ inline bool MD5Hash::operator<=(const MD5Hash &other) const
+ return !other.operator<(*this);
+ }
+
+-inline MD5Hash::MD5Hash(const MD5Hash &other)
+-{
+- memcpy(&hash, &other.hash, sizeof(hash));
+-}
+-
+-inline MD5Hash& MD5Hash::operator=(const MD5Hash &other)
+-{
+- memcpy(&hash, &other.hash, sizeof(hash));
+-
+- return *this;
+-}
++#ifdef WIN32
++#pragma pack(pop)
++#endif
++#undef PACKED
+
+ #endif // __MD5_H__
+diff --git a/par2cmdline.h b/par2cmdline.h
+index afd4dcc..9d8f103 100644
+--- a/par2cmdline.h
++++ b/par2cmdline.h
+@@ -132,6 +132,10 @@ typedef unsigned int u32;
+ typedef unsigned long long u64;
+ #endif
+
++// FIXME: this is not done right w/ autoconf
++#include <sys/ioctl.h>
++#include <sys/mount.h>
++
+ #if HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+@@ -179,6 +183,8 @@ typedef unsigned long long u64;
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/ioctl.h>
++#include <sys/mount.h>
+ #include <dirent.h>
+ #include <assert.h>
+
+--
+1.7.10.3
+
Added: csw/mgar/pkg/par2cmdline/trunk/files/0002-Debian-0.4-11-serial-001_hardlinks.patch
===================================================================
--- csw/mgar/pkg/par2cmdline/trunk/files/0002-Debian-0.4-11-serial-001_hardlinks.patch (rev 0)
+++ csw/mgar/pkg/par2cmdline/trunk/files/0002-Debian-0.4-11-serial-001_hardlinks.patch 2012-06-29 12:55:41 UTC (rev 18603)
@@ -0,0 +1,29 @@
+From 17ded79c040155c3ce94910245f26f8e7f340bb8 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 29 Jun 2012 13:01:25 +0200
+Subject: [PATCH] Debian 0.4-11 serial 001_hardlinks
+
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5db5804..9d1cc4a 100755
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -55,9 +55,9 @@ EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \
+ TESTS = pretest test1 test2 test3 test4 test5 test6 posttest
+
+ install-exec-hook :
+- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2create$(EXEEXT)
+- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2verify$(EXEEXT)
+- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2repair$(EXEEXT)
++ ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2create$(EXEEXT)
++ ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2verify$(EXEEXT)
++ ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2repair$(EXEEXT)
+
+ uninstall-hook :
+ rm -f $(DESTDIR)$(bindir)/par2create$(EXEEXT)
+--
+1.7.10.3
+
Added: csw/mgar/pkg/par2cmdline/trunk/files/0003-Debian-0.4-11-serial-002_gcc_40_fixes.patch
===================================================================
--- csw/mgar/pkg/par2cmdline/trunk/files/0003-Debian-0.4-11-serial-002_gcc_40_fixes.patch (rev 0)
+++ csw/mgar/pkg/par2cmdline/trunk/files/0003-Debian-0.4-11-serial-002_gcc_40_fixes.patch 2012-06-29 12:55:41 UTC (rev 18603)
@@ -0,0 +1,70 @@
+From 3b386d104d43e9f421fda957412738600d4ba627 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 29 Jun 2012 13:04:30 +0200
+Subject: [PATCH] Debian 0.4-11 serial gcc_40_fixes
+
+---
+ reedsolomon.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/reedsolomon.cpp b/reedsolomon.cpp
+index d7f96e6..82b3d9a 100644
+--- a/reedsolomon.cpp
++++ b/reedsolomon.cpp
+@@ -51,7 +51,7 @@ u32 gcd(u32 a, u32 b)
+ }
+ }
+
+-bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
++template <> bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
+ {
+ inputcount = (u32)present.size();
+
+@@ -80,7 +80,7 @@ bool ReedSolomon<Galois8>::SetInput(const vector<bool> &present)
+ return true;
+ }
+
+-bool ReedSolomon<Galois8>::SetInput(u32 count)
++template <> bool ReedSolomon<Galois8>::SetInput(u32 count)
+ {
+ inputcount = count;
+
+@@ -101,7 +101,7 @@ bool ReedSolomon<Galois8>::SetInput(u32 count)
+ return true;
+ }
+
+-bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
++template <> bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
+ {
+ // Look up the appropriate element in the RS matrix
+ Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex];
+@@ -189,7 +189,7 @@ bool ReedSolomon<Galois8>::Process(size_t size, u32 inputindex, const void *inpu
+
+ // Set which of the source files are present and which are missing
+ // and compute the base values to use for the vandermonde matrix.
+-bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
++template <> bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
+ {
+ inputcount = (u32)present.size();
+
+@@ -233,7 +233,7 @@ bool ReedSolomon<Galois16>::SetInput(const vector<bool> &present)
+
+ // Record that the specified number of source files are all present
+ // and compute the base values to use for the vandermonde matrix.
+-bool ReedSolomon<Galois16>::SetInput(u32 count)
++template <> bool ReedSolomon<Galois16>::SetInput(u32 count)
+ {
+ inputcount = count;
+
+@@ -267,7 +267,7 @@ bool ReedSolomon<Galois16>::SetInput(u32 count)
+ return true;
+ }
+
+-bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
++template <> bool ReedSolomon<Galois16>::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer)
+ {
+ // Look up the appropriate element in the RS matrix
+
+--
+1.7.10.3
+
Added: csw/mgar/pkg/par2cmdline/trunk/files/0004-Debian-0.4-11-serial-003_fix_crash_in_quiet_mode.patch
===================================================================
--- csw/mgar/pkg/par2cmdline/trunk/files/0004-Debian-0.4-11-serial-003_fix_crash_in_quiet_mode.patch (rev 0)
+++ csw/mgar/pkg/par2cmdline/trunk/files/0004-Debian-0.4-11-serial-003_fix_crash_in_quiet_mode.patch 2012-06-29 12:55:41 UTC (rev 18603)
@@ -0,0 +1,30 @@
+From ca09fd103683e78638ab5a995c0ed532b1f1b1cf Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 29 Jun 2012 14:01:00 +0200
+Subject: [PATCH] Debian 0.4-11 serial 003_fix_crash_in_quiet_mode
+
+---
+ par2creatorsourcefile.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/par2creatorsourcefile.cpp b/par2creatorsourcefile.cpp
+index fceb6cd..2e81f6c 100644
+--- a/par2creatorsourcefile.cpp
++++ b/par2creatorsourcefile.cpp
+@@ -213,11 +213,12 @@ bool Par2CreatorSourceFile::Open(CommandLine::NoiseLevel noiselevel, const Comma
+ }
+ }
+
++ offset += want;
++
+ if (noiselevel > CommandLine::nlQuiet)
+ {
+ // Display progress
+ u32 oldfraction = (u32)(1000 * offset / filesize);
+- offset += want;
+ u32 newfraction = (u32)(1000 * offset / filesize);
+ if (oldfraction != newfraction)
+ {
+--
+1.7.10.3
+
Added: csw/mgar/pkg/par2cmdline/trunk/files/0005-Fix-media-size-ioctl.patch
===================================================================
--- csw/mgar/pkg/par2cmdline/trunk/files/0005-Fix-media-size-ioctl.patch (rev 0)
+++ csw/mgar/pkg/par2cmdline/trunk/files/0005-Fix-media-size-ioctl.patch 2012-06-29 12:55:41 UTC (rev 18603)
@@ -0,0 +1,28 @@
+From 020c08037f52bb74a9f2d159f3d3eeac19c9baff Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 29 Jun 2012 14:09:08 +0200
+Subject: [PATCH] Fix media size ioctl
+
+Inspired by the Debian serial patch 004_kfreebsd.diff and http://diskscrub.googlecode.com/git-history/04fcaadaef7ff8aae7b1268d788cb896556b1c55/src/getsize.c
+---
+ diskfile.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/diskfile.cpp b/diskfile.cpp
+index 8eaf710..59c3085 100644
+--- a/diskfile.cpp
++++ b/diskfile.cpp
+@@ -27,6 +27,10 @@ static char THIS_FILE[]=__FILE__;
+ #endif
+ #endif
+
++#if defined(__sun__)
++#include <sys/dkio.h>
++#define BLKGETSIZE64 DKIOCGMEDIAINFO
++#endif
+
+ #ifdef WIN32
+ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+--
+1.7.10.3
+
Added: csw/mgar/pkg/par2cmdline/trunk/files/0006-Fix-pretest-script.patch
===================================================================
--- csw/mgar/pkg/par2cmdline/trunk/files/0006-Fix-pretest-script.patch (rev 0)
+++ csw/mgar/pkg/par2cmdline/trunk/files/0006-Fix-pretest-script.patch 2012-06-29 12:55:41 UTC (rev 18603)
@@ -0,0 +1,25 @@
+From fe3e78e74fec62782f4f31308a2c5c53300e5bab Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 29 Jun 2012 14:40:45 +0200
+Subject: [PATCH] Fix pretest script
+
+---
+ pretest | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pretest b/pretest
+index 2c50406..b6f6ba5 100755
+--- a/pretest
++++ b/pretest
+@@ -4,7 +4,7 @@ rm -f test*.log
+ rm -rf testdir
+ mkdir testdir && cd testdir || { echo "ERROR: Could not change to test directory" ; exit 1; } >&2
+
+-gunzip -c ../$srcdir/testdata.tar.gz | tar xf - || { echo "ERROR: Could not extra test files" ; exit 1; } >&2
++gunzip -c $srcdir/testdata.tar.gz | tar xf - || { echo "ERROR: Could not extra test files" ; exit 1; } >&2
+
+ cp test-0.data test-0.data.orig
+ cp test-1.data test-1.data.orig
+--
+1.7.10.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list