[arch-commits] Commit in foremost/repos/community-x86_64 (5 files)
Allan McRae
allan at gemini.archlinux.org
Fri Jun 3 03:24:58 UTC 2022
Date: Friday, June 3, 2022 @ 03:24:57
Author: allan
Revision: 1219107
archrelease: copy trunk to community-x86_64
Added:
foremost/repos/community-x86_64/PKGBUILD
(from rev 1219106, foremost/trunk/PKGBUILD)
foremost/repos/community-x86_64/foremost-1.5.7-fno-common.patch
(from rev 1219106, foremost/trunk/foremost-1.5.7-fno-common.patch)
foremost/repos/community-x86_64/foremost-makefile.patch
(from rev 1219106, foremost/trunk/foremost-makefile.patch)
Deleted:
foremost/repos/community-x86_64/PKGBUILD
foremost/repos/community-x86_64/foremost-makefile.patch
---------------------------------+
PKGBUILD | 76 ++++++++++++++---------------
foremost-1.5.7-fno-common.patch | 99 ++++++++++++++++++++++++++++++++++++++
foremost-makefile.patch | 46 ++++++++---------
3 files changed, 161 insertions(+), 60 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-03 03:24:38 UTC (rev 1219106)
+++ PKGBUILD 2022-06-03 03:24:57 UTC (rev 1219107)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemordy at archlinux.org>
-
-pkgname=foremost
-pkgver=1.5.7
-pkgrel=4
-pkgdesc="A console program to recover files based on their headers, footers, and internal data structures"
-arch=('x86_64')
-url="http://foremost.sourceforge.net/"
-license=('custom')
-depends=('glibc')
-makedepends=('patch')
-backup=(etc/foremost.conf)
-source=(http://foremost.sourceforge.net/pkg/$pkgname-$pkgver.tar.gz
- $pkgname-makefile.patch)
-sha512sums=('8827c29d52496783be26374f3943eb26a154d842f34e50fb489f87b3a5045bf85f1e44d7d8d8b12b2355ba3fe4b06a0db979cc22c0f431593c5976001eb931ab'
- 'eb3fc70590cafa3fb953946f6d80051ab3d976bcb3687cadb141a72dbd5bf317de68f39db7e28e27b49dd1629cab7e4c0ff5bc83c962c33026e9fe4d4ad2dc96')
-
-prepare() {
- cd "${srcdir}"/$pkgname-$pkgver
- patch -Np0 -i "${srcdir}"/$pkgname-makefile.patch
-}
-
-build() {
- cd "${srcdir}"/$pkgname-$pkgver
- make
-}
-
-package () {
- cd "${srcdir}"/$pkgname-$pkgver
-
- install -d "${pkgdir}"/{etc,usr/bin,usr/share/man/man8,usr/share/licenses/foremost}
- make DESTDIR="${pkgdir}" install
-
-#license
- ./foremost -V > "${pkgdir}"/usr/share/licenses/$pkgname/COPYRIGHT
-}
Copied: foremost/repos/community-x86_64/PKGBUILD (from rev 1219106, foremost/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-06-03 03:24:57 UTC (rev 1219107)
@@ -0,0 +1,39 @@
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+
+pkgname=foremost
+pkgver=1.5.7
+pkgrel=5
+pkgdesc="A console program to recover files based on their headers, footers, and internal data structures"
+arch=('x86_64')
+url="http://foremost.sourceforge.net/"
+license=('custom')
+depends=('glibc')
+makedepends=('patch')
+backup=(etc/foremost.conf)
+source=(http://foremost.sourceforge.net/pkg/$pkgname-$pkgver.tar.gz
+ $pkgname-makefile.patch
+ $pkgname-1.5.7-fno-common.patch)
+sha512sums=('8827c29d52496783be26374f3943eb26a154d842f34e50fb489f87b3a5045bf85f1e44d7d8d8b12b2355ba3fe4b06a0db979cc22c0f431593c5976001eb931ab'
+ 'eb3fc70590cafa3fb953946f6d80051ab3d976bcb3687cadb141a72dbd5bf317de68f39db7e28e27b49dd1629cab7e4c0ff5bc83c962c33026e9fe4d4ad2dc96'
+ '4a129e0bb97f2c8aa09d6861077e732886e1d26573cc8698abfb03b55ebcf73c7ba1fbd6de25c5a4d2ce8cd271ebf07aa277d823d54640e6922ebc72a6aaba46')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ patch -Np0 -i "${srcdir}"/$pkgname-makefile.patch
+ patch -Np1 -i "${srcdir}"/$pkgname-1.5.7-fno-common.patch
+}
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+ make
+}
+
+package () {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ install -d "${pkgdir}"/{etc,usr/bin,usr/share/man/man8,usr/share/licenses/foremost}
+ make DESTDIR="${pkgdir}" install
+
+#license
+ ./foremost -V > "${pkgdir}"/usr/share/licenses/$pkgname/COPYRIGHT
+}
Copied: foremost/repos/community-x86_64/foremost-1.5.7-fno-common.patch (from rev 1219106, foremost/trunk/foremost-1.5.7-fno-common.patch)
===================================================================
--- foremost-1.5.7-fno-common.patch (rev 0)
+++ foremost-1.5.7-fno-common.patch 2022-06-03 03:24:57 UTC (rev 1219107)
@@ -0,0 +1,99 @@
+diff -up foremost-1.5.7/api.c.me foremost-1.5.7/api.c
+--- foremost-1.5.7/api.c.me 2020-02-06 14:15:48.218200745 +0100
++++ foremost-1.5.7/api.c 2020-02-06 14:16:42.624853860 +0100
+@@ -20,6 +20,7 @@ int currFATblk;
+ int highblk = 0;
+ int block_list[OUR_BLK_SIZE / sizeof(int)];
+ extern int errno;
++struct DIRECTORY *dirlist, *dl;
+
+ /*Inititialize those globals used by extract_ole*/
+ void init_ole()
+diff -up foremost-1.5.7/extract.c.me foremost-1.5.7/extract.c
+--- foremost-1.5.7/extract.c.me 2020-02-06 14:10:30.446386101 +0100
++++ foremost-1.5.7/extract.c 2020-02-06 14:15:14.736798823 +0100
+@@ -25,6 +25,7 @@ extern char *extract_name;
+ extern int extract;
+ extern int FATblk;
+ extern int highblk;
++extern struct DIRECTORY *dirlist, *dl;
+
+ /********************************************************************************
+ *Function: extract_zip
+diff -up foremost-1.5.7/main.h.me foremost-1.5.7/main.h
+--- foremost-1.5.7/main.h.me 2020-02-06 13:48:46.923922983 +0100
++++ foremost-1.5.7/main.h 2020-02-06 13:50:08.001849830 +0100
+@@ -292,7 +292,7 @@ char *__progname;
+ /* -----------------------------------------------------------------
+ State Variable and Global Variables
+ ----------------------------------------------------------------- */
+-char wildcard;
++extern char wildcard;
+ typedef struct f_state
+ {
+ off_t mode;
+@@ -344,7 +344,7 @@ typedef struct s_spec
+ int written; /*used for -a mode*/
+ }s_spec;
+
+-s_spec search_spec[50]; /*ARRAY OF BUILTIN SEARCH TYPES*/
++extern s_spec search_spec[50]; /*ARRAY OF BUILTIN SEARCH TYPES*/
+
+ typedef struct f_info {
+ char *file_name;
+@@ -367,7 +367,7 @@ typedef struct f_info {
+ } f_info;
+
+ /* Set if the user hits ctrl-c */
+-int signal_caught;
++extern int signal_caught;
+
+ /* -----------------------------------------------------------------
+ Function definitions
+@@ -433,7 +433,7 @@ off_t find_file_size(FILE *f);
+ char *human_readable(off_t size, char *buffer);
+ char *units(unsigned int c);
+ unsigned int chop(char *buf);
+-void print_search_specs(f_state *s);
++extern void print_search_specs(f_state *s);
+ int memwildcardcmp(const void *s1, const void *s2,size_t n,int caseSensitive);
+ int charactersMatch(char a, char b, int caseSensitive);
+ void printx(unsigned char* buf,int start, int end);
+diff -up foremost-1.5.7/ole.h.me foremost-1.5.7/ole.h
+--- foremost-1.5.7/ole.h.me 2020-02-06 14:08:16.524783353 +0100
++++ foremost-1.5.7/ole.h 2020-02-06 14:10:02.954056080 +0100
+@@ -84,8 +84,8 @@ struct DIRECTORY
+ int s2;
+ int d1;
+ int d2;
+-}
+-*dirlist, *dl;
++};
++
+
+ int get_dir_block(unsigned char *fd, int blknum, int buffersize);
+ int get_dir_info(unsigned char *src);
+diff -up foremost-1.5.7/state.c.me foremost-1.5.7/state.c
+--- foremost-1.5.7/state.c.me 2020-02-06 14:06:44.514684887 +0100
++++ foremost-1.5.7/state.c 2020-02-06 14:08:03.329625827 +0100
+@@ -2,6 +2,9 @@
+
+ #include "main.h"
+
++s_spec search_spec[50];
++char wildcard;
++
+ int initialize_state (f_state * s, int argc, char **argv)
+ {
+ char **argv_copy = argv;
+diff -up foremost-1.5.7/main.c.me foremost-1.5.7/main.c
+--- foremost-1.5.7/main.c.me 2020-02-06 14:20:09.918342282 +0100
++++ foremost-1.5.7/main.c 2020-02-06 14:20:42.531733786 +0100
+@@ -15,6 +15,7 @@
+ *
+ */
+ #include "main.h"
++int signal_caught;
+
+ #ifdef __WIN32
+
Deleted: foremost-makefile.patch
===================================================================
--- foremost-makefile.patch 2022-06-03 03:24:38 UTC (rev 1219106)
+++ foremost-makefile.patch 2022-06-03 03:24:57 UTC (rev 1219107)
@@ -1,23 +0,0 @@
---- Makefile.orig 2008-10-14 02:09:13.000000000 +0200
-+++ Makefile 2008-10-14 18:31:38.000000000 +0200
-@@ -26,5 +26,5 @@
- # Where we get installed
--BIN = /usr/local/bin
--MAN = /usr/share/man/man8
--CONF= /usr/local/etc
-+BIN = $(DESTDIR)/usr/bin
-+MAN = $(DESTDIR)/usr/share/man/man8
-+CONF= $(DESTDIR)/etc
- # Setup for compiling and cross-compiling for Windows
-diff -uNr foremost-1.4.orig/config.c foremost-1.4/config.c
---- config.c 2006-08-31 17:50:47.000000000 +0100
-+++ config.c 2006-08-31 17:51:09.000000000 +0100
-@@ -288,7 +288,7 @@
- #ifdef __WIN32
- set_config_file(s, "/Program Files/foremost/foremost.conf");
- #else
-- set_config_file(s, "/usr/local/etc/foremost.conf");
-+ set_config_file(s, "/etc/foremost.conf");
- #endif
- if ((f = fopen(get_config_file(s), "r")) == NULL)
- {
Copied: foremost/repos/community-x86_64/foremost-makefile.patch (from rev 1219106, foremost/trunk/foremost-makefile.patch)
===================================================================
--- foremost-makefile.patch (rev 0)
+++ foremost-makefile.patch 2022-06-03 03:24:57 UTC (rev 1219107)
@@ -0,0 +1,23 @@
+--- Makefile.orig 2008-10-14 02:09:13.000000000 +0200
++++ Makefile 2008-10-14 18:31:38.000000000 +0200
+@@ -26,5 +26,5 @@
+ # Where we get installed
+-BIN = /usr/local/bin
+-MAN = /usr/share/man/man8
+-CONF= /usr/local/etc
++BIN = $(DESTDIR)/usr/bin
++MAN = $(DESTDIR)/usr/share/man/man8
++CONF= $(DESTDIR)/etc
+ # Setup for compiling and cross-compiling for Windows
+diff -uNr foremost-1.4.orig/config.c foremost-1.4/config.c
+--- config.c 2006-08-31 17:50:47.000000000 +0100
++++ config.c 2006-08-31 17:51:09.000000000 +0100
+@@ -288,7 +288,7 @@
+ #ifdef __WIN32
+ set_config_file(s, "/Program Files/foremost/foremost.conf");
+ #else
+- set_config_file(s, "/usr/local/etc/foremost.conf");
++ set_config_file(s, "/etc/foremost.conf");
+ #endif
+ if ((f = fopen(get_config_file(s), "r")) == NULL)
+ {
More information about the arch-commits
mailing list