steffen: server/file Makefile, NONE, 1.1 kolab-filemagic.patch, NONE, 1.1 kolab.patch, NONE, 1.1

cvs at kolab.org cvs at kolab.org
Thu Oct 19 04:31:32 CEST 2006


Author: steffen

Update of /kolabrepository/server/file
In directory doto:/tmp/cvs-serv15975/file

Added Files:
	Makefile kolab-filemagic.patch kolab.patch 
Log Message:
custom file package (issue1458)

--- NEW FILE: Makefile ---
ifeq "x$(KOLABPKGURI)" "x"
  KOLABPKGURI = ftp://ftp.openpkg.org/release/2.5/SRC
endif
ifeq "x$(KOLABRPMSRC)" "x"
  KOLABRPMSRC = /kolab/RPM/SRC
endif
ifeq "x$(KOLABCVSDIR)" "x"
  KOLABCVSDIR = $(CURDIR)
endif

PACKAGE=file
VERSION=4.15
RELEASE=2.5.0
KOLABRELEASE=2.5.0_kolab

RPM=/kolab/bin/openpkg rpm
KOLABPKGURI:=`/kolab/bin/openpkg register -R $(KOLABPKGURI)`

all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
	$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

	cp $(KOLABCVSDIR)/kolab-filemagic.patch $(KOLABRPMSRC)/$(PACKAGE)/
	cp $(KOLABCVSDIR)/kolab.patch $(KOLABRPMSRC)/$(PACKAGE)/           # Patch for file.spec
	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec 

$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

dist: all
	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/

clean:
	rm -rf /kolab/RPM/TMP/$(PACKAGE)-$(VERSION)

--- NEW FILE: kolab-filemagic.patch ---
diff -upr ../file-4.15.orig/magic/Magdir/msdos ./magic/Magdir/msdos
--- ../file-4.15.orig/magic/Magdir/msdos	2005-08-18 17:00:48.000000000 +0200
+++ ./magic/Magdir/msdos	2006-10-19 04:15:45.000000000 +0200
@@ -255,15 +255,16 @@
 # Uncommenting only the first two lines will cover about 2/3 of COM files,
 # but it isn't feasible to match all COM files since there must be at least
 # two dozen different one-byte "magics".
-0	byte		0xe9		MS-DOS executable (COM)
->6	string		SFX\ of\ LHarc	(%s)
-0	byte		0x8c		MS-DOS executable (COM)
+# Those one-byte patterns are too dangerous for Kolab
+#0	byte		0xe9		MS-DOS executable (COM)
+#>6	string		SFX\ of\ LHarc	(%s)
+#0	byte		0x8c		MS-DOS executable (COM)
 # 0xeb conflicts with "sequent" magic
-0	byte		0xeb		MS-DOS executable (COM)
->4	string		\ $ARX		\b, ARX self-extracting archive
->4	string		\ $LHarc	\b, LHarc self-extracting archive
->0x20e	string		SFX\ by\ LARC	\b, LARC self-extracting archive
-0	byte		0xb8		COM executable for MS-DOS
+#0	byte		0xeb		MS-DOS executable (COM)
+#>4	string		\ $ARX		\b, ARX self-extracting archive
+#>4	string		\ $LHarc	\b, LHarc self-extracting archive
+#>0x20e	string		SFX\ by\ LARC	\b, LARC self-extracting archive
+#0	byte		0xb8		COM executable for MS-DOS
 # many compressed/converted COMs start with a copy loop instead of a jump
 0x6	search/0xa	\xfc\x57\xf3\xa5\xc3	COM executable for MS-DOS
 0x6	search/0xa	\xfc\x57\xf3\xa4\xc3	COM executable for MS-DOS

--- NEW FILE: kolab.patch ---
--- file.spec.orig	2006-10-19 04:17:54.000000000 +0200
+++ file.spec	2006-10-19 04:20:49.000000000 +0200
@@ -37,7 +37,7 @@ Class:        BASE
 Group:        Filesystem
 License:      BSD
 Version:      %{V_api_c}
-Release:      2.5.0
+Release:      2.5.0_kolab
 
 #   package options
 %option       with_perl  no
@@ -46,6 +46,9 @@ Release:      2.5.0
 Source0:      ftp://ftp.astron.com/pub/file/file-%{V_api_c}.tar.gz
 Source1:      http://www.cpan.org/modules/by-module/File/File-LibMagic-%{V_api_pl}.tgz
 
+#   list of patches
+Patch0:       kolab-filemagic.patch
+
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
@@ -79,6 +82,7 @@ AutoReqProv:  no
 %prep
     %setup -q
     %setup -q -D -T -a 1
+    %patch -p0
 
 %build
     ACLOCAL=true \





More information about the commits mailing list