.drone.yml

@@ -0,0 +1,18 @@
+pipeline:
+  build:
+    image: debian
+    pull: true
+    commands:
+      - echo "HALLO WELT, KANNST DU MICH HOEREN"
+    when:
+      event: [push, tag]
+
+  package:
+    image: debian
+    pull: true
+    commands:
+      - echo "zap"
+    when:
+      event: tag
+
+branches: master

.gitignore

@@ -1,18 +0,0 @@
-*.exe
-/build/
-
-# ignore the debian stuff
-debhelper-build-stamp
-.DS_Store
-.debhelper
-*.deb
-*.dsc
-*.build
-*.buildinfo
-*.changes
-*.tar.gz
-*.log
-*.substvars
-/*/debian/mdg-test
-/*/debian/files
-/*/mdg-test

.woodpecker.yml

@@ -1,34 +0,0 @@
-pipeline:
-  build_deb:
-    image: gitea.mdg-hamburg.de/ci-tools/deb-buildpackage:latest
-    pull: true
-    commands:
-      - make package
-      - ls ..
-      - dpkg -c ../*.deb
-    when:
-      event: [push, tag]
-
-  publish:
-    image: docker.io/plugins/sftp:linux-amd64
-    pull: true
-    settings:
-      host:
-        from_secret: deb_repo_ssh_host
-      port:
-        from_secret: deb_repo_ssh_port
-      username:
-        from_secret: deb_repo_ssh_username
-      password:
-        from_secret: deb_repo_ssh_password
-      files:
-        - ../*.deb
-        - ../*.dsc
-        - ../*.git
-        - ../*.changes
-        - ../*.buildinfo
-      destination_path: /var/www/repository/debian/incoming/input
-    when:
-      event: [tag]
-
-branches: master

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Kevin Dorner
+Copyright (c) 2021 Kevin Dorner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,51 +1,31 @@
-PKG_NAME := mdg-test
+#Config
-PKG_VERSION := 3.9.2
+UPSTREAM_VERSION = 3.9.2
-PKG_OPSI_RELEASE := 1.0
+PKG_SUB_RELEASE = 1.0
-PKG_DEB_RELEASE := 1
+PKG_FULL_VERSION = ${UPSTREAM_VERSION}-${PKG_SUB_RELEASE}
 
-# sources and checksums can be found on https://www.python.org/downloads/windows/
+SOURCE = https://www.python.org/ftp/python/${UPSTREAM_VERSION}/python-${UPSTREAM_VERSION}-amd64.exe
-SOURCE_FILENAME := python-$(PKG_VERSION)-amd64.exe
+CHECKSUM = efb20aa1b648a2baddd949c142d6eb06
-SOURCE := https://www.python.org/ftp/python/$(PKG_VERSION)/$(SOURCE_FILENAME)
+## Download Link and Checksums can be found on https://www.python.org/downloads/windows/
-CHECKSUM := efb20aa1b648a2baddd949c142d6eb06
 
-default: fetch-sources patch-fields
+all: clean install
 
-BUILDDIR := build
+install: setversion
-$(BUILDDIR):
+	@[ -d "./data/" ] || mkdir ./data/
-	mkdir -p $(BUILDDIR)/data
+	@echo "INFO: Downloading the Git for Windows executable..."
-
+	@wget -O ./data/python-${UPSTREAM_VERSION}-amd64.exe ${SOURCE}
-fetch-sources: $(BUILDDIR)
+	@echo "${CHECKSUM} ./data/python-${UPSTREAM_VERSION}-amd64.exe" | md5sum -c && echo "SUCCESS: Checksums match" || { ec=$$?; echo "ERROR: Checksum mismatch" >&2; rm -rf ./data/ >&2; exit $$ec; }
-	curl -o $(BUILDDIR)/data/$(SOURCE_FILENAME) $(SOURCE)
+	@echo "SUCCESS: Installed Successfully"
-	echo "$(CHECKSUM) $(BUILDDIR)/data/$(SOURCE_FILENAME)" | md5sum -c
-
-patch-fields: $(BUILDDIR)
-	sed -e "s|@PKG_VERSION@|$(PKG_VERSION)|" \
-	-e "s|@PKG_OPSI_RELEASE@|$(PKG_OPSI_RELEASE)|" \
-	control.in > $(BUILDDIR)/control
 
 clean:
-	rm -rf $(BUILDDIR)
+	@echo "INFO: Cleaning ./data/"
-
+	@rm -rf ./data/
-install: $(BUILDDIR)
+	@[ ! -d "./data/" ] && echo "SUCCESS: Cleaned" 
-	install -Dm644 $(BUILDDIR)/control -t $(DESTDIR)/srv/deploy/install/$(PKG_NAME)
-	install -Dm644 $(BUILDDIR)/data/* -t $(DESTDIR)/srv/deploy/install/$(PKG_NAME)/data
-	install -Dm644 *.ins -t $(DESTDIR)/srv/deploy/install/$(PKG_NAME)
-	install -Dm644 logo.png -t $(DESTDIR)/srv/deploy/install/$(PKG_NAME)
-	
-uninstall:
-	rm -rf $(DESTDIR)/srv/deploy/install/$(PKG_NAME)
 
+setversion:
+	@echo "INFO: Writing version ${PKG_FULL_VERSION} to control file"
+	@sed -i "s/^version: [0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}$$/version: ${UPSTREAM_VERSION}/" ./control
+	@sed -i "s/^packageVersion: [0-9]\{1,3\}\.[0-9]\{1,3\}$$/packageVersion: ${PKG_SUB_RELEASE}/" ./control
 package:
-	dpkg-buildpackage --unsigned-source --unsigned-changes --no-check-builddeps
+	@echo "MEEP!"
+.PHONY: all install clean setversion package 
 
-# DEB_CHANGELOG_VERSION := $(shell dpkg-parsechangelog -S Version | sed -rne 's|((-*[^-]+)+)(-[^-]+)|\1|p')
-package-check-changelog:
-	@if [ "$(DEB_CHANGELOG_VERSION)" != "$(PKG_FULL_VERSION)" ]; then \
-		echo "Mismatch between debian changelog file and Makefile version"; \
-		echo "Debian changelog version: $(DEB_CHANGELOG_VERSION)"; \
-		echo "Makefile version: $(PKG_FULL_VERSION)"; \
-		exit 1; \
-	fi
-
-
-.PHONY: default fetch-sources patch-fields clean install uninstall package package-check-changelog

README.md

@@ -1,4 +1,3 @@
-![status-badge](https://drone.mdg-hamburg.de/api/badges/kevin.dorner/CI-Test/status.svg)
 # mdg-python
 A better Python for Windows OPSI package aimed to work with IServ
 
@@ -24,3 +23,7 @@ git clone --depth 1 https://gitea.mdg-hamburg.de/MDG-Packages/winst-mdg-python.g
 ```sh
 cd /srv/deploy/install/mdg-python/ && make
 ```
+3. Run chkdeploy to make IServ aware of the new package
+```sh
+chkdeploy
+```

control

@@ -4,8 +4,8 @@ id: mdg-python
 name: MDG Python
 description: Python für Microsoft Windows mit pip-Unterstützung
 advice: Vereinfachtes Paket mit neuer Python-Version und funktionsfähiger pip-Unterstützung
-version: @PKG_VERSION@
+version: 3.9.2
-packageVersion: @PKG_OPSI_RELEASE@
+packageVersion: 1.0
 setupScript: install.ins
 uninstallScript: remove.ins
 

debian/changelog

@@ -1,5 +0,0 @@
-mdg-test (3.9.2-1.0-1) unstable; urgency=medium
-
-  * Initial release. (Closes: #XXXXXX)
-
- -- root <root@mdg-hamburg.test-iserv.de>  Mon, 20 Sep 2021 00:37:16 +0200

debian/compat

@@ -1 +0,0 @@
-13

debian/control

@@ -1,19 +0,0 @@
-Source: mdg-test
-Maintainer: Marion Dönhoff Gymnasium <repository@mdg-hamburg.de>
-Section: misc
-Priority: optional
-Standards-Version: 4.6.0
-Build-Depends: debhelper (>= 13)
-Vcs-Git: https://gitea.mdg-hamburg.de/MDG-Packages/winst-mdg-python.git
-Vcs-Browser: https://gitea.mdg-hamburg.de/MDG-Packages/winst-mdg-python
-
-
-Package: mdg-test
-Architecture: all
-Depends: winst-microsoft-windows-10-64
-Provides: winst-python
-Description: OPSI package Python for Windows 10 64bit
- Features:
- * Latest Python version
- * Slim and simple package
- * Automated Python package installation through pip

debian/copyright

@@ -1,76 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: winst-mdg-python
-
-Files: *
-Copyright: 2021 Kevin Dorner
-License: MIT
-
-Files: data/*
-Copyright: 2001-2021 Python Software Foundation
-License: Python
-
-Files: debian/*
-Copyright: 2021 Kevin Dorner
-License: MIT
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is furnished
- to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
- OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-License: Python
- 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
- the Individual or Organization ("Licensee") accessing and otherwise using Python
- 3.9.2 software in source or binary form and its associated documentation.
- .
- 2. Subject to the terms and conditions of this License Agreement, PSF hereby
- grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
- analyze, test, perform and/or display publicly, prepare derivative works,
- distribute, and otherwise use Python 3.9.2 alone or in any derivative
- version, provided, however, that PSF's License Agreement and PSF's notice of
- copyright, i.e., "Copyright © 2001-2021 Python Software Foundation; All Rights
- Reserved" are retained in Python 3.9.2 alone or in any derivative version
- prepared by Licensee.
- .
- 3. In the event Licensee prepares a derivative work that is based on or
- incorporates Python 3.9.2 or any part thereof, and wants to make the
- derivative work available to others as provided herein, then Licensee hereby
- agrees to include in any such work a brief summary of the changes made to Python
- 3.9.2.
- .
- 4. PSF is making Python 3.9.2 available to Licensee on an "AS IS" basis.
- PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.  BY WAY OF
- EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
- WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
- USE OF PYTHON 3.9.2 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
- .
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 3.9.2
- FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
- MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 3.9.2, OR ANY DERIVATIVE
- THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- .
- 6. This License Agreement will automatically terminate upon a material breach of
- its terms and conditions.
- .
- 7. Nothing in this License Agreement shall be deemed to create any relationship
- of agency, partnership, or joint venture between PSF and Licensee.  This License
- Agreement does not grant permission to use PSF trademarks or trade name in a
- trademark sense to endorse or promote products or services of Licensee, or any
- third party.
- .
- 8. By copying, installing or otherwise using Python 3.9.2, Licensee agrees
- to be bound by the terms and conditions of this License Agreement.
-

debian/rules

@@ -1,4 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@

debian/source/format

@@ -1 +0,0 @@
-3.0 (git)

install.ins

@@ -53,7 +53,6 @@ endif
 
 [Files_Cleanup]
 ; This ensures all data has been removed
-; Leave previous versions for future removal
 delete -sf "%ProgramFiles64Dir%\python39\"
 
 [WinBatch_Setup]