prepare 1.6.0

HenriWahl · Jul 27, 2024 · 016a6ac · 016a6ac
1 parent 6085fc3
commit 016a6ac
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 77 deletions.
diff --git a/.github/workflows/build-release-latest.yml b/.github/workflows/build-release-latest.yml
@@ -55,75 +55,6 @@ jobs:
           path: ./*.rpm
           retention-days: 1
 
-#  repo-debian:
-#    runs-on: ubuntu-latest
-#    needs: [build-debian]
-#    env:
-#      dist: debian
-#    steps:
-#      - uses: actions/checkout@v2
-#      # get binaries created by other jobs
-#      - uses: actions/download-artifact@v2
-#      # build container image for repo packaging, using the same as for building
-#      - run: /usr/bin/docker build -t ${{ github.job }} -f build/Dockerfile-${{ env.dist }} .
-#      # make entrypoints executable
-#      - run: chmod +x build/entrypoint-*.sh
-#      # get secret signing key
-#      - run: echo "${{ secrets.DHCPY6D_SIGNING_KEY }}" >  signing_key.asc
-#      # organize SSH deploy key for dhcp6d-jekyll repo
-#      - run: mkdir ~/.ssh
-#      - run: echo "${{ secrets.DHCPY6D_REPO_SSH_KEY }}" >  ~/.ssh/id_ed25519
-#      - run: chmod -R go-rwx ~/.ssh
-#      # get and prepare dhcpy6d-jekyll
-#      - run: git clone git@github.com:HenriWahl/dhcpy6d-jekyll.git
-#      - run: rm -rf ${{ env.repo_dir }}/${{ env.release }}/${{ env.dist }}
-#      - run: mkdir -p ${{ env.repo_dir }}/${{ env.release }}/${{ env.dist }}
-#      # execute container with matching entrypoint
-#      - run: |
-#          /usr/bin/docker run --volume ${{ github.workspace }}:/dhcpy6d \
-#                              --volume ${{ github.workspace }}/build/entrypoint-${{ github.job }}.sh:/entrypoint.sh \
-#                              --entrypoint /entrypoint.sh \
-#                              --env RELEASE=${{ env.release }} \
-#                              ${{ github.job }}
-#      # commit and push new binaries to dhcpyd-jekyll
-#      - run: git config --global user.email "repo@dhcpy6d.de" && git config --global user.name "Dhcpy6d Repository"
-#      - run: cd ${{ env.repo_dir }} && git add . && git commit -am "new ${{ env.release }} repo ${{ env.dist }}" && git push
-#
-#  repo-centos:
-#    runs-on: ubuntu-latest
-#    # has to wait for repo-debian to avoid parallel processing of git repo dhcpy6d-jekyll
-#    needs: [build-centos, repo-debian]
-#    env:
-#      dist: centos
-#    steps:
-#      - uses: actions/checkout@v2
-#      # get binaries created by other jobs
-#      - uses: actions/download-artifact@v2
-#      # build container image for repo packaging, using the same as for building
-#      - run: /usr/bin/docker build -t ${{ github.job }} -f build/Dockerfile-${{ env.dist }} .
-#      # make entrypoints executable
-#      - run: chmod +x build/entrypoint-*.sh
-#      # get secret signing key
-#      - run: echo "${{ secrets.DHCPY6D_SIGNING_KEY }}" >  signing_key.asc
-#      # organize SSH deploy key for dhcp6d-jekyll repo
-#      - run: mkdir ~/.ssh
-#      - run: echo "${{ secrets.DHCPY6D_REPO_SSH_KEY }}" >  ~/.ssh/id_ed25519
-#      - run: chmod -R go-rwx ~/.ssh
-#      # get and prepare dhcpy6d-jekyll
-#      - run: git clone git@github.com:HenriWahl/dhcpy6d-jekyll.git
-#      - run: rm -rf ${{ env.repo_dir }}/${{ env.release }}/${{ env.dist }}
-#      - run: mkdir -p ${{ env.repo_dir }}/${{ env.release }}/${{ env.dist }}
-#      # execute container with matching entrypoint
-#      - run: |
-#          /usr/bin/docker run --volume ${{ github.workspace }}:/dhcpy6d \
-#                              --volume ${{ github.workspace }}/build/entrypoint-${{ github.job }}.sh:/entrypoint.sh \
-#                              --entrypoint /entrypoint.sh \
-#                              --env RELEASE=${{ env.release }} \
-#                              ${{ github.job }}
-#      # commit and push new binaries to dhcpyd-jekyll
-#      - run: git config --global user.email "repo@dhcpy6d.de" && git config --global user.name "Dhcpy6d Repository"
-#      - run: cd ${{ env.repo_dir }} && git add . && git commit -am "new ${{ env.release }} repo ${{ env.dist }}" && git push
-
   github-release:
     runs-on: ubuntu-latest
     needs: [build-debian, build-centos]

diff --git a/Changelog b/Changelog
@@ -1,5 +1,11 @@
 Changelog for dhcpy6d
 
+2023-07-02 1.6.0
+
+    added option 82 support
+    added option 83 support
+    added partly option 20 support
+
 2023-07-02 1.4.0
 
     added prefix_route_link_local for client config

diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,11 @@
-dhcpy6d (1.5.0-1) unstable; urgency=medium
+dhcpy6d (1.6.0-1) stable; urgency=medium
 
   * New upstream release
+    + added option 82 support
+    + added option 83 support
+    + added partly option 20 support
 
- -- Henri Wahl <henri@dhcpy6d.de>  Tue, 28 May 2024 00:00:00 +0200
+ -- Henri Wahl <henri@dhcpy6d.de>  Sat, 27 Jul 2024 00:00:00 +0200
 
 dhcpy6d (1.4.0-1) stable; urgency=medium
 

diff --git a/dhcpy6d/handler.py b/dhcpy6d/handler.py
@@ -422,11 +422,11 @@ def build_response(self, message_type_response, transaction, options_request, st
             options_answer = []
 
             # Option 20 reconfigure accept - for client compatibility, actually
-            # not really supported
+            # not really supported, added here to add to options
             # https://github.com/HenriWahl/dhcpy6d/issues/64
-            if CONST.OPTION.RECONF_ACCEPT in transaction.options.keys():
-                response_string += build_option(CONST.OPTION.RECONF_ACCEPT, '')
-                options_answer.append(CONST.OPTION.RECONF_ACCEPT)
+            if CONST.OPTION.RECONF_ACCEPT in transaction.options.keys() and \
+                not CONST.OPTION.RECONF_ACCEPT in options_request:
+                options_request.append(CONST.OPTION.RECONF_ACCEPT)
 
             # build all requested options if they are handled
             for number in options_request:
@@ -454,7 +454,7 @@ def build_response(self, message_type_response, transaction, options_request, st
                     volatile_store.db_connect()
 
                 # create error handler - headers have to be recreated because
-                # problems may have arisen while processing and these information
+                # problems may have arisen while processing and this information
                 # is not valid anymore
                 # handler type + transaction id
                 response_string = f'{CONST.MESSAGE.REPLY:02x}'

diff --git a/setup.py b/setup.py
@@ -63,7 +63,7 @@
               ]
 
 setup(name='dhcpy6d',
-      version='1.5.0',
+      version='1.6.0',
       license='GNU GPL v2',
       description='DHCPv6 server daemon',
       long_description='Dhcpy6d delivers IPv6 addresses for DHCPv6 clients, which can be identified by DUID, hostname or MAC address as in the good old IPv4 days. It allows easy dualstack transition, addresses may be generated randomly, by range, by DNS, by arbitrary ID or MAC address. Clients can get more than one address, leases and client configuration can be stored in databases and DNS can be updated dynamically.',