From ec607d65fef9d6cd238f220bf6411222bbc3c488 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 18 Aug 2014 23:39:32 +0200 Subject: [PATCH 1/4] remove freecode support Signed-off-by: Nico Schottelius --- Makefile | 13 +------------ PKGBUILD.in | 6 ++++++ bin/build-helper | 18 ------------------ 3 files changed, 7 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 112b1411..396551fb 100644 --- a/Makefile +++ b/Makefile @@ -170,17 +170,6 @@ $(ML_FILE): $(CHANGELOG_FILE) ml-release: $(ML_FILE) -################################################################################ -# Release: Freecode -# -FREECODE_FILE=.lock-freecode - -$(FREECODE_FILE): $(CHANGELOG_FILE) - $(helper) freecode-release $(CHANGELOG_VERSION) - touch $@ - -freecode-release: $(FREECODE_FILE) - ################################################################################ # pypi # @@ -197,7 +186,7 @@ ARCHLINUX_FILE=.lock-archlinux ARCHLINUXTAR=cdist-$(CHANGELOG_VERSION)-1.src.tar.gz $(ARCHLINUXTAR): PKGBUILD - makepkg -c --source + umask 022; makepkg -c --source PKGBUILD: PKGBUILD.in $(PYTHON_VERSION) ./PKGBUILD.in $(CHANGELOG_VERSION) diff --git a/PKGBUILD.in b/PKGBUILD.in index e3ae4619..c967249d 100755 --- a/PKGBUILD.in +++ b/PKGBUILD.in @@ -17,7 +17,13 @@ source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz" package() { cd cdist-\${pkgver} python3 setup.py build install --root="\${pkgdir}" + find "\$pkgdir" -type d -exec chmod 0755 {} \; + find "\$pkgdir" -type f -exec chmod a+r {} \; } eof makepkg -g >> "${outfile}" + +# Fix this issue: +# error: failed to upload cdist-3.1.6-1.src.tar.gz: Error - all files must have permissions of 644 or 755. +chmod a+r "${outfile}" diff --git a/bin/build-helper b/bin/build-helper index d28c0616..31789a2e 100755 --- a/bin/build-helper +++ b/bin/build-helper @@ -145,21 +145,6 @@ eof ;; - freecode-release) - version=$1; shift - printf "Enter tag list for freecode release %s> " "$version" - read taglist - - printf "Enter changelog for freecode release %s> " "$version" - read changelog - - echo "Submitting to freecode ..." - python2 ~/p/foreign/freecode-submit-2.7/freecode-submit -P cdist \ - -v "$version" -c "$changelog" \ - -t "$taglist" \ - -n - ;; - release-git-tag) target_version=$($0 changelog-version) if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then @@ -258,9 +243,6 @@ eof # Archlinux release is based on pypi make archlinux-release - # Announce change on Freecode - make freecode-release - # Announce change on ML make ml-release From 3223a388891c966e3c3b800c3b160f3d174a1c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Catalinas=20Jim=C3=A9nez?= Date: Sat, 13 Sep 2014 23:31:38 +0100 Subject: [PATCH 2/4] Fix typo in cdistmarker doc --- cdist/conf/type/__cdistmarker/man.text | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdist/conf/type/__cdistmarker/man.text b/cdist/conf/type/__cdistmarker/man.text index ca5611a7..3a59659b 100644 --- a/cdist/conf/type/__cdistmarker/man.text +++ b/cdist/conf/type/__cdistmarker/man.text @@ -40,7 +40,7 @@ EXAMPLES __cdistmarker # Creates the marker differently. -__cdistmarker --file /tmp/cdist_marker --format '+%s' +__cdistmarker --destination /tmp/cdist_marker --format '+%s' -------------------------------------------------------------------------------- From ea633d3f2e72b4ce1d398969b4b1e82266c8bf10 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 14 Sep 2014 13:52:35 +0200 Subject: [PATCH 3/4] ++changes Signed-off-by: Nico Schottelius --- docs/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changelog b/docs/changelog index e54da541..3649bf36 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,6 +5,9 @@ Changelog * Exception: No braces means author == Nico Schottelius +3.1.7: + * Type __cdistmarker: Fix typo (Ricardo Catalinas Jiménez) + 3.1.6: 2014-08-18 * New Type: __ssh_dot_ssh * Type __package_yum: Support retrieving package via URL From 72947b7f6b3c79911d069259dce2896be391b93d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 16 Sep 2014 15:59:08 +0200 Subject: [PATCH 4/4] Fix typo in cdist-explorer Thanks, henk! 15:53 < henk> telmich: s/Except/Expect/ in http://www.nico.schottelius.org/software/cdist/man/latest/man7/cdist-explorer.html Signed-off-by: Nico Schottelius --- docs/man/man7/cdist-explorer.text | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/man/man7/cdist-explorer.text b/docs/man/man7/cdist-explorer.text index 2c25d845..a99be050 100644 --- a/docs/man/man7/cdist-explorer.text +++ b/docs/man/man7/cdist-explorer.text @@ -50,7 +50,7 @@ else name="$__object_id" fi -# Except dpkg failing, if package is not known / installed +# Expect dpkg failing, if package is not known / installed dpkg -s "$name" 2>/dev/null || exit 0 -------------------------------------------------------------------------------- @@ -64,5 +64,5 @@ SEE ALSO COPYING ------- -Copyright \(C) 2010-2012 Nico Schottelius. Free use of this software is +Copyright \(C) 2010-2014 Nico Schottelius. Free use of this software is granted under the terms of the GNU General Public License version 3 (GPLv3).