From b575206d60c0a6007d434961bc553671a9c63ea2 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Sun, 23 Aug 2020 08:27:10 -0500
Subject: [PATCH] Moved to slp format

---
 Makefile                    | 20 ++++++++++----------
 Makefile.cyrus-sasl-dev     |  2 +-
 {SNAP => SL}/README         |  0
 {SNAP => SL}/saslauthd.init |  0
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename {SNAP => SL}/README (100%)
 rename {SNAP => SL}/saslauthd.init (100%)

diff --git a/Makefile b/Makefile
index 26c29e7..b3dde36 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.
@@ -62,7 +62,7 @@
 #		of the package.
 
 export ARCH = x86_64
-export DEPENDS = e2fsprogs,glibc,krb5,openssl
+export DEPENDS = dash,e2fsprogs,glibc,krb5,openssl
 export BUILDDEPS = 
 export SRCPKG = cyrus-sasl
 export URL = https://www.cyrusimap.org/sasl/
@@ -71,16 +71,16 @@ BRIEF = Cyrus implementation of SASL
 DESC = Cyrus SASL is an implementation of SASL that makes it easy for \
 application developers to integrate authentication mechanisms into their \
 application in a generic way.
-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
@@ -134,14 +134,14 @@ $(ROOT): $(SRCDIR)/lib/.libs/libsasl2.so
 	install -v -d -m 0755 $(ROOT)/etc/init.d && \
 	install -v -d -m 0755 $(ROOT)/usr/share/doc/cyrus-sasl && \
 	install -v -d -m 0700 $(ROOT)/var/lib/sasl && \
-	install -v -m 0755 $(SNAPDIR)/saslauthd.init \
+	install -v -m 0755 $(SLDIR)/saslauthd.init \
 		$(ROOT)/etc/init.d/saslauthd && \
 	install -v -m 0644 doc/*.html $(ROOT)/usr/share/doc/cyrus-sasl && \
 	install -v -m 0644 doc/*.txt $(ROOT)/usr/share/doc/cyrus-sasl && \
 	install -v -m 0644 doc/*.fig $(ROOT)/usr/share/doc/cyrus-sasl && \
 	install -v -m 0644 doc/ONEWS $(ROOT)/usr/share/doc/cyrus-sasl && \
 	install -v -m 0644 doc/TODO $(ROOT)/usr/share/doc/cyrus-sasl && \
-	install -v -d $(DEV)/SNAP && \
+	install -v -d $(DEV)/SL && \
 	install -v -d $(DEVROOT) && \
 	for file in `find $(ROOT)| \
 	egrep 'pkgconfig\/|\.a$$|\.h$$|\.la$$|\.pc$$'`; do \
@@ -150,7 +150,7 @@ $(ROOT): $(SRCDIR)/lib/.libs/libsasl2.so
 		mv $$file $$path; \
 	done
 	find $(ROOT) -type d -empty -delete && \
-	cd $(DEV) && make -f ../Makefile.$(PACKAGE)-dev && mv *.snap ../
+	cd $(DEV) && make -f ../Makefile.$(PACKAGE)-dev && mv *.slp ../
 
 test: $(ROOT)
 	@cd $(SRCDIR) && make check
@@ -158,7 +158,7 @@ test: $(ROOT)
 clean:
 	@rm -rvf $(ROOT) \
 		$(DEV) \
-		$(SNAPINFO) \
+		$(SLINFO) \
 		$(MANIFEST) \
 		$(FILES) \
 		$(SRCDIR)
diff --git a/Makefile.cyrus-sasl-dev b/Makefile.cyrus-sasl-dev
index 49bb67d..30fbd35 100644
--- a/Makefile.cyrus-sasl-dev
+++ b/Makefile.cyrus-sasl-dev
@@ -13,4 +13,4 @@ REPO = dev
 BRIEF = Development files for cyrus-sasl
 DESC = Development files for cyrus-sasl
 
-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/saslauthd.init b/SL/saslauthd.init
similarity index 100%
rename from SNAP/saslauthd.init
rename to SL/saslauthd.init