From 2fa97a27b501401c13ec87bbf6d9742943336a9d Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Sat, 22 Aug 2020 14:38:19 -0500 Subject: [PATCH] Moved to slp format --- Makefile | 31 ++++++++++++++++--------------- Makefile.dev | 2 +- Makefile.doc | 2 +- Makefile.utils | 2 +- {SNAP => SL}/README | 0 {SNAP => SL}/named.init | 0 {SNAP => SL}/usher | 0 SNAP/config.tar.gz | Bin 1796 -> 0 bytes 8 files changed, 19 insertions(+), 18 deletions(-) rename {SNAP => SL}/README (100%) rename {SNAP => SL}/named.init (100%) rename {SNAP => SL}/usher (100%) delete mode 100644 SNAP/config.tar.gz diff --git a/Makefile b/Makefile index 40ecd59..2c84c61 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # server. This might be one of core, main, dev, or # perhaps others. # * BRIEF: Short description, should be 50 chars or less -# * SNAPVER: This is the package version. When a package is +# * SLVER: This is the package version. When a package is # changed, but no changes are made to the source code # this value should be increased. This would include # things like usher being modified, changes to default @@ -34,7 +34,7 @@ # * PATCHDIR: This directory should be ./SRC/patches and is # required, whether or not patches are used. # * VERSION: This should be set automatically based on the -# version string in the source directory and SNAPVER. +# version string in the source directory and SLVER. # The default command here should work in many cases, # but certain packages may need to use a different # method. @@ -63,7 +63,7 @@ export ARCH = x86_64 export DEPENDS = dash,e2fsprogs,glibc,krb5,libcap,libxml2,ncurses,openssl,readline,zlib -export BUILDDEPS = +export BUILDDEPS = krb5-dev,libcap-dev,libxml2-dev,ncurses-dev,openssl-dev,readline-dev,zlib-dev export SRCPKG = $(PACKAGE) export URL = https://www.isc.org/downloads/bind/ REPO = server @@ -71,16 +71,16 @@ BRIEF = DNS server DESC = BIND is open source software that enables you to publish your \ Domain Name System (DNS) information on the Internet, and to resolve \ DNS queries for your users. -SNAPVER = 0 +SLVER = 1 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') PATCHDIR := $(PWD)/SRC/patches export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \ - sed 's/^-//')-$(SNAPVER) + sed 's/^-//')-$(SLVER) -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux DEV := $(PWD)/$(PACKAGE)-dev DEVROOT := $(DEV)/ROOT @@ -139,9 +139,9 @@ $(ROOT): $(SRCDIR)/bin/named/.libs/named @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ install -v -m 0755 -d $(ROOT)/etc/init.d && \ install -v -m 0700 -d $(ROOT)/var/named && \ - install -v -m 0755 $(SNAPDIR)/named.init $(ROOT)/etc/init.d/named && \ + install -v -m 0755 $(SLDIR)/named.init $(ROOT)/etc/init.d/named && \ mv -v $(ROOT)/etc/bind.keys $(ROOT)/var/named/bind.keys - @install -v -d $(DEV)/SNAP $(DEVROOT) && \ + @install -v -d $(DEV)/SL $(DEVROOT) && \ for file in `find $(ROOT)| \ egrep 'man3\/|\.a$$|\.h$$|\.la$$'`; do \ path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \ @@ -149,18 +149,18 @@ $(ROOT): $(SRCDIR)/bin/named/.libs/named mv $$file $$path; \ done && \ find $(ROOT) -type d -empty -delete && \ - cd $(DEV) && make -f ../Makefile.dev && mv *.snap ../ - @install -v -d $(UTILS)/SNAP $(UTILSROOT) && \ + cd $(DEV) && make -f ../Makefile.dev && mv *.slp ../ + @install -v -d $(UTILS)/SL $(UTILSROOT) && \ install -v -m 0755 -d $(UTILSROOT)/usr/bin && \ install -v -m 0755 -d $(UTILSROOT)/usr/share/man/man1 && \ mv -v $(ROOT)/usr/bin/{{,m}dig,host,nslookup} $(UTILSROOT)/usr/bin && \ mv -v $(ROOT)/usr/share/man/man1/{{,m}dig,host,nslookup}.1 \ $(UTILSROOT)/usr/share/man/man1 && \ - cd $(UTILS) && make -f ../Makefile.utils && mv *.snap ../ - @install -v -d $(DOC)/SNAP $(DOCROOT) && \ + cd $(UTILS) && make -f ../Makefile.utils && mv *.slp ../ + @install -v -d $(DOC)/SL $(DOCROOT) && \ install -v -m 0755 -d $(DOCROOT)/usr/share/doc/bind && \ cp -a $(SRCDIR)/doc/* $(DOCROOT)/usr/share/doc/bind && \ - cd $(DOC) && make -f ../Makefile.doc && mv *.snap ../ + cd $(DOC) && make -f ../Makefile.doc && mv *.slp ../ test: $(ROOT) @cd $(SRCDIR); \ @@ -171,8 +171,9 @@ clean: $(DEV) \ $(DOC) \ $(UTILS) \ - $(SNAPINFO) \ + $(SLINFO) \ $(MANIFEST) \ $(FILES) \ - $(SRCDIR) + $(SRCDIR) \ + $(CONFIG) diff --git a/Makefile.dev b/Makefile.dev index d8c97bd..6b6e961 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -13,4 +13,4 @@ REPO = dev BRIEF = Development files for bind DESC = Development files for bind -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux diff --git a/Makefile.doc b/Makefile.doc index 8130b98..67fe9de 100644 --- a/Makefile.doc +++ b/Makefile.doc @@ -13,4 +13,4 @@ DEPENDS = BRIEF = Documentation for BIND DNS server and utilities DESC = Documentation for BIND DNS server and utilities -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux diff --git a/Makefile.utils b/Makefile.utils index bba56b7..98cafcc 100644 --- a/Makefile.utils +++ b/Makefile.utils @@ -13,4 +13,4 @@ DEPENDS = BRIEF = Bind DNS utilities DESC = Bind DNS utilities -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux diff --git a/SNAP/README b/SL/README similarity index 100% rename from SNAP/README rename to SL/README diff --git a/SNAP/named.init b/SL/named.init similarity index 100% rename from SNAP/named.init rename to SL/named.init diff --git a/SNAP/usher b/SL/usher similarity index 100% rename from SNAP/usher rename to SL/usher diff --git a/SNAP/config.tar.gz b/SNAP/config.tar.gz deleted file mode 100644 index e192d7db650e07bdfca46ca77324a6b365e95542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1796 zcmV+f2mAORiwFRbve#Px1MOM;Z`wE*?yvAySm>l~(s1J>5J>M%$AI;?YeNNWr~Py? ziGgS#K}l%Grv2~t+Tpt{C6(xQcYd}O^2U$-K7Rf6x-4}s&Q1&sU{xyO6R`g&z7xZ! zRxDk&H2q8?8a$n$%BdaWm?tTX5ju;bC_Pl}srUaU$rbzj_8JFoFVNr?(E`!9{*^T`casmuSJABKW1(k#S2urxTA44E=rg1X6Ae4 zksq+-i+CO`2MxRs1)vjCKS_Nzk(cA|6DaxZviKzm;XN*iCey`?p@|=+ypoLR4KeTQ z?ZO(?FwrgShh^${F{bg1Zt;FKHUzCo?`;0xm&vMvdZ<#CG-iu)-3#Dl+{KY1!} zqLkS%e>@h)$WPEbfx!DAjA-iRsV5q3%gw{|M?yuyVu&Sofv<=u%hme5pH4(A=jG8k z$`%#8J3_n#xaYf%1cDD?gr#~J*5g;;9I7KJkG&$CkyD!b@nH!m!y<^4Yjo~E6;jpNsUO*71jxc{l>YW;r+tn>U6j)FY#HwnN0 zA*Nxd_`d`;@n7D%oS=;-_W!C;HCFe36XxbY{};h3UmWn9PF$KyqQFZ;BF?ka zcuILL4@oTIJs?g9%M3k1A!8mB_esT7J$~q?J`MaY47t>WN}>_!gei+d2HANurGB_m z$C~(x;W0)r8!<@aU6v)8!XaRAZ%SEx2qW|}xBpsNbNLa)AJ5~=RY8Jg-*%jqtjX7y zyIXvy96qPiV~E~SKcGXf3>TU6PN%sc%tMdGkU&S_Vj9g8^losA=tc;KsBS-T&RkiY zs)U#w61cv+gV_M;#vNzS?tur`X%E(fa<^BOrRTl=e)%;eph=46Gmr8MCyuV0Mnh;$ zH{T##BehM@m<3SEL%h30^ha6r`E_i@<>iT{n;OZQc-QUSw0qYdk+bUnyendvqZ~$6 zECAVq)91e%xYz9t%KdilLmRX}4Y(+=N%#%%o78LABv`}du`~deqY=BJ8TODG%(ivg z&>rX_xYO_8cI$m!O>ZTdB(?*Z>bQ=HiJ{YvC2p(IZ1`f^!#zb!d<%M>5u>I=kHmIB zkB$uko0#aw^7iD|w!0?=M%*oaf75zSd|DDc65GM}Sh!9wF^=W!>G5padpM7rM!$it zx*u}NX-nitYzM=mYX;U04HNBH>aHSMvu!3>8Tw7!?Oo**^iCp3Vmm0P0{?WA9Lw8_ z&&ak%lK8+9*J?TVrgNQB(UnAz#CA{-Aux-ou+AMx+?7ON4td)CplfvdxY4_YpPP@* zkoCJnmc({IRt?uJOzIl07{@aAblEmg_d>No)rr1yLeq4HN5F z=0=h=VjDr-+jg%pXt&VYj|lj%8(leXP{(QFoTC1ah?3Y2imHGhy@p|*Jd(M)&$_y` zz0Gb*>veA1$Z0lniuzL`N@6=8%HV%y=DSk;SmJh|U=1e^#dMkt$H}SWTB1Z^JD`N` zM>W`C^<#Ovlc)~s9dI9r`K!}v=hSi|(IT-uss-{v2ng0KI58Yc+=%g9!?ukI$Y_Ti zKgIHc`S(t_ekknZ|B!c|q79McAGrTFiM7iAt5t*l{YTd=UFH8TflHVhB2kX{AF~sN zAU&j6{tC%I3L=*V@H?6fsrw01aY%+o)P_JSRFQ|sei{%Q{>m+B6upibNXA(6?ulJar5n